mirror of https://github.com/docker/cli.git
Merge pull request #4916 from dvdksn/docs-typos-corrections
docs: typo fixes and other corrections
This commit is contained in:
commit
4e9abfecf5
|
@ -108,7 +108,7 @@ Create and run a new container from an image
|
||||||
| [`-t`](#tty), [`--tty`](#tty) | | | Allocate a pseudo-TTY |
|
| [`-t`](#tty), [`--tty`](#tty) | | | Allocate a pseudo-TTY |
|
||||||
| [`--ulimit`](#ulimit) | `ulimit` | | Ulimit options |
|
| [`--ulimit`](#ulimit) | `ulimit` | | Ulimit options |
|
||||||
| `-u`, `--user` | `string` | | Username or UID (format: <name\|uid>[:<group\|gid>]) |
|
| `-u`, `--user` | `string` | | Username or UID (format: <name\|uid>[:<group\|gid>]) |
|
||||||
| `--userns` | `string` | | User namespace to use |
|
| [`--userns`](#userns) | `string` | | User namespace to use |
|
||||||
| [`--uts`](#uts) | `string` | | UTS namespace to use |
|
| [`--uts`](#uts) | `string` | | UTS namespace to use |
|
||||||
| [`-v`](#volume), [`--volume`](#volume) | `list` | | Bind mount a volume |
|
| [`-v`](#volume), [`--volume`](#volume) | `list` | | Bind mount a volume |
|
||||||
| `--volume-driver` | `string` | | Optional volume driver for the container |
|
| `--volume-driver` | `string` | | Optional volume driver for the container |
|
||||||
|
@ -271,6 +271,21 @@ container.
|
||||||
strace: Process 1 attached
|
strace: Process 1 attached
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### <a name="userns"></a> Disable namespace remapping for a container (--userns)
|
||||||
|
|
||||||
|
If you enable user namespaces on the daemon,
|
||||||
|
all containers are started with user namespaces enabled by default.
|
||||||
|
To disable user namespace remapping for a specific container,
|
||||||
|
you can set the `--userns` flag to `host`.
|
||||||
|
|
||||||
|
```console
|
||||||
|
docker run --userns=host hello-world
|
||||||
|
```
|
||||||
|
|
||||||
|
`host` is the only valid value for the `--userns` flag.
|
||||||
|
|
||||||
|
For more information, refer to [Isolate containers with a user namespace](https://docs.docker.com/engine/security/userns-remap/).
|
||||||
|
|
||||||
### <a name="uts"></a> UTS settings (--uts)
|
### <a name="uts"></a> UTS settings (--uts)
|
||||||
|
|
||||||
```text
|
```text
|
||||||
|
|
|
@ -69,7 +69,7 @@ user credentials, VPNs, and so forth.
|
||||||
> **Note**
|
> **Note**
|
||||||
>
|
>
|
||||||
> If the `URL` parameter contains a fragment the system recursively clones
|
> If the `URL` parameter contains a fragment the system recursively clones
|
||||||
> the repository and its submodules using a `git clone --recursive` command.
|
> the repository and its submodules.
|
||||||
|
|
||||||
Git URLs accept context configuration in their fragment section, separated by a
|
Git URLs accept context configuration in their fragment section, separated by a
|
||||||
colon (`:`). The first part represents the reference that Git checks out,
|
colon (`:`). The first part represents the reference that Git checks out,
|
||||||
|
|
|
@ -1347,7 +1347,7 @@ using the `daemon.json` file.
|
||||||
"default-network-opts": {
|
"default-network-opts": {
|
||||||
"bridge": {
|
"bridge": {
|
||||||
"com.docker.network.bridge.host_binding_ipv4": "127.0.0.1",
|
"com.docker.network.bridge.host_binding_ipv4": "127.0.0.1",
|
||||||
"com.docker.network.bridge.mtu": "1234"
|
"com.docker.network.driver.mtu": "1234"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1363,7 +1363,7 @@ you create use these option configurations as defaults.
|
||||||
```console
|
```console
|
||||||
$ docker network create mynet
|
$ docker network create mynet
|
||||||
$ docker network inspect mynet --format "{{json .Options}}"
|
$ docker network inspect mynet --format "{{json .Options}}"
|
||||||
{"com.docker.network.bridge.host_binding_ipv4":"127.0.0.1","com.docker.network.bridge.mtu":"1234"}
|
{"com.docker.network.bridge.host_binding_ipv4":"127.0.0.1","com.docker.network.driver.mtu":"1234"}
|
||||||
```
|
```
|
||||||
|
|
||||||
Note that changing this daemon configuration doesn't affect pre-existing
|
Note that changing this daemon configuration doesn't affect pre-existing
|
||||||
|
@ -1377,5 +1377,5 @@ daemon configuration. The CLI flag expects a value with the following format:
|
||||||
```console
|
```console
|
||||||
$ sudo dockerd \
|
$ sudo dockerd \
|
||||||
--default-network-opt bridge=com.docker.network.bridge.host_binding_ipv4=127.0.0.1 \
|
--default-network-opt bridge=com.docker.network.bridge.host_binding_ipv4=127.0.0.1 \
|
||||||
--default-network-opt bridge=com.docker.network.bridge.mtu=1234
|
--default-network-opt bridge=com.docker.network.driver.mtu=1234
|
||||||
```
|
```
|
||||||
|
|
|
@ -7,7 +7,7 @@ title: Running containers
|
||||||
---
|
---
|
||||||
|
|
||||||
Docker runs processes in isolated containers. A container is a process
|
Docker runs processes in isolated containers. A container is a process
|
||||||
which runs on a host. The host may be local or remote. When an you
|
which runs on a host. The host may be local or remote. When you
|
||||||
execute `docker run`, the container process that runs is isolated in
|
execute `docker run`, the container process that runs is isolated in
|
||||||
that it has its own file system, its own networking, and its own
|
that it has its own file system, its own networking, and its own
|
||||||
isolated process tree separate from the host.
|
isolated process tree separate from the host.
|
||||||
|
|
Loading…
Reference in New Issue