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

Merge pull request #2137 from Lah123/master 

update docs based on PR 39949
This commit is contained in:
Silvin Lubecki 2019-10-15 14:52:25 +02:00 committed by GitHub
parent b27ac92ef7 86281a7b4b
commit b14a42a5a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,7 @@ Options:
--log-opt map Default log driver options for containers (default map[]) --log-opt map Default log driver options for containers (default map[])
--max-concurrent-downloads int Set the max concurrent downloads for each pull (default 3) --max-concurrent-downloads int Set the max concurrent downloads for each pull (default 3)
--max-concurrent-uploads int Set the max concurrent uploads for each push (default 5) --max-concurrent-uploads int Set the max concurrent uploads for each push (default 5)
--max-download-attempts int Set the max download attempts for each pull (default 5)
--metrics-addr string Set default address and port to serve the metrics api on --metrics-addr string Set default address and port to serve the metrics api on
--mtu int Set the containers network MTU --mtu int Set the containers network MTU
--node-generic-resources list Advertise user-defined resource --node-generic-resources list Advertise user-defined resource
@ -1323,6 +1324,7 @@ This is a full example of the allowed configuration options on Linux:
"cluster-advertise": "", "cluster-advertise": "",
"max-concurrent-downloads": 3, "max-concurrent-downloads": 3,
"max-concurrent-uploads": 5, "max-concurrent-uploads": 5,
"max-download-attempts": 5,
"default-shm-size": "64M", "default-shm-size": "64M",
"shutdown-timeout": 15, "shutdown-timeout": 15,
"debug": true, "debug": true,
@ -1424,6 +1426,7 @@ This is a full example of the allowed configuration options on Windows:
"cluster-advertise": "", "cluster-advertise": "",
"max-concurrent-downloads": 3, "max-concurrent-downloads": 3,
"max-concurrent-uploads": 5, "max-concurrent-uploads": 5,
"max-download-attempts": 5,
"shutdown-timeout": 15, "shutdown-timeout": 15,
"debug": true, "debug": true,
"hosts": [], "hosts": [],
@ -1473,6 +1476,7 @@ The list of currently supported options that can be reconfigured is this:
- `live-restore`: Enables [keeping containers alive during daemon downtime](https://docs.docker.com/config/containers/live-restore/). - `live-restore`: Enables [keeping containers alive during daemon downtime](https://docs.docker.com/config/containers/live-restore/).
- `max-concurrent-downloads`: it updates the max concurrent downloads for each pull. - `max-concurrent-downloads`: it updates the max concurrent downloads for each pull.
- `max-concurrent-uploads`: it updates the max concurrent uploads for each push. - `max-concurrent-uploads`: it updates the max concurrent uploads for each push.
- `max-download-attempts`: it updates the max download attempts for each pull.
- `default-runtime`: it updates the runtime to be used if not is - `default-runtime`: it updates the runtime to be used if not is
specified at container creation. It defaults to "default" which is specified at container creation. It defaults to "default" which is
the runtime shipped with the official docker packages. the runtime shipped with the official docker packages.

4
man/dockerd.8.md
View File

@ -56,6 +56,7 @@ dockerd - Enable daemon mode
[**--mtu**[=*0*]] [**--mtu**[=*0*]]
[**--max-concurrent-downloads**[=*3*]] [**--max-concurrent-downloads**[=*3*]]
[**--max-concurrent-uploads**[=*5*]] [**--max-concurrent-uploads**[=*5*]]
[**--max-download-attempts**[=*5*]]
[**--node-generic-resources**[=*[]*]] [**--node-generic-resources**[=*[]*]]
[**-p**|**--pidfile**[=*/var/run/docker.pid*]] [**-p**|**--pidfile**[=*/var/run/docker.pid*]]
[**--raw-logs**] [**--raw-logs**]
@ -329,6 +330,9 @@ unix://[/path/to/socket] to use.
**--max-concurrent-uploads**=*5* **--max-concurrent-uploads**=*5*
Set the max concurrent uploads for each push. Default is `5`. Set the max concurrent uploads for each push. Default is `5`.
**--max-download-attempts**=*5*
Set the max download attempts for each pull. Default is `5`.
**--node-generic-resources**=*[]* **--node-generic-resources**=*[]*
Advertise user-defined resource. Default is `[]`. Advertise user-defined resource. Default is `[]`.
Use this if your swarm cluster has some nodes with custom Use this if your swarm cluster has some nodes with custom