Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3093 from thaJeztah/20.10_backport_fix_plugin_link 

[20.10 backport] docs: dockerd: fix broken link and markdown touch-ups
This commit is contained in:
Silvin Lubecki 2021-05-19 14:53:15 +02:00 committed by GitHub
parent 54b529feae 8264f5be8d
commit e0d47b1c0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docs/reference/commandline/dockerd.md
View File

@ -1203,8 +1203,8 @@ command line or Docker's Engine API are allowed or denied by the plugin.
If you have multiple plugins installed, each plugin, in order, must If you have multiple plugins installed, each plugin, in order, must
allow the request for it to complete. allow the request for it to complete.
For information about how to create an authorization plugin, see [authorization For information about how to create an authorization plugin, refer to the
plugin](../../extend/plugins_authorization.md) section in the Docker extend section of this documentation. [authorization plugin](../../extend/plugins_authorization.md) section.
### Daemon user namespace options ### Daemon user namespace options
@ -1232,10 +1232,16 @@ Docker supports softlinks for the Docker data directory (`/var/lib/docker`) and
for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be
set like this: set like this:
DOCKER_TMPDIR=/mnt/disk2/tmp /usr/local/bin/dockerd -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1 ```console
# or $ DOCKER_TMPDIR=/mnt/disk2/tmp /usr/local/bin/dockerd -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1
export DOCKER_TMPDIR=/mnt/disk2/tmp ```
/usr/local/bin/dockerd -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1
or
```console
$ export DOCKER_TMPDIR=/mnt/disk2/tmp
$ /usr/local/bin/dockerd -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1
````
#### Default cgroup parent #### Default cgroup parent
@ -1564,7 +1570,9 @@ previously configured cluster configurations.
### Run multiple daemons ### Run multiple daemons
> **Note:** Running multiple daemons on a single host is considered as "experimental". The user should be aware of > **Note:**
>
> Running multiple daemons on a single host is considered as "experimental". The user should be aware of
> unsolved problems. This solution may not work properly in some cases. Solutions are currently under development > unsolved problems. This solution may not work properly in some cases. Solutions are currently under development
> and will be delivered in the near future. > and will be delivered in the near future.
@ -1616,7 +1624,7 @@ The `--tls*` options enable use of specific certificates for individual daemons.
Example script for a separate “bootstrap” instance of the Docker daemon without network: Example script for a separate “bootstrap” instance of the Docker daemon without network:
```bash ```console
$ sudo dockerd \ $ sudo dockerd \
-H unix:///var/run/docker-bootstrap.sock \ -H unix:///var/run/docker-bootstrap.sock \
-p /var/run/docker-bootstrap.pid \ -p /var/run/docker-bootstrap.pid \