Skip to content

Commit

Permalink
Merge pull request #2137 from Lah123/master
Browse files Browse the repository at this point in the history
update docs based on PR 39949
  • Loading branch information
silvin-lubecki authored Oct 15, 2019
2 parents b27ac92 + 86281a7 commit b14a42a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions docs/reference/commandline/dockerd.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Options:
--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-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
--mtu int Set the containers network MTU
--node-generic-resources list Advertise user-defined resource
Expand Down Expand Up @@ -1323,6 +1324,7 @@ This is a full example of the allowed configuration options on Linux:
"cluster-advertise": "",
"max-concurrent-downloads": 3,
"max-concurrent-uploads": 5,
"max-download-attempts": 5,
"default-shm-size": "64M",
"shutdown-timeout": 15,
"debug": true,
Expand Down Expand Up @@ -1424,6 +1426,7 @@ This is a full example of the allowed configuration options on Windows:
"cluster-advertise": "",
"max-concurrent-downloads": 3,
"max-concurrent-uploads": 5,
"max-download-attempts": 5,
"shutdown-timeout": 15,
"debug": true,
"hosts": [],
Expand Down Expand Up @@ -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/).
- `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-download-attempts`: it updates the max download attempts for each pull.
- `default-runtime`: it updates the runtime to be used if not is
specified at container creation. It defaults to "default" which is
the runtime shipped with the official docker packages.
Expand Down
4 changes: 4 additions & 0 deletions man/dockerd.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ dockerd - Enable daemon mode
[**--mtu**[=*0*]]
[**--max-concurrent-downloads**[=*3*]]
[**--max-concurrent-uploads**[=*5*]]
[**--max-download-attempts**[=*5*]]
[**--node-generic-resources**[=*[]*]]
[**-p**|**--pidfile**[=*/var/run/docker.pid*]]
[**--raw-logs**]
Expand Down Expand Up @@ -329,6 +330,9 @@ unix://[/path/to/socket] to use.
**--max-concurrent-uploads**=*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**=*[]*
Advertise user-defined resource. Default is `[]`.
Use this if your swarm cluster has some nodes with custom
Expand Down

0 comments on commit b14a42a

Please sign in to comment.