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

Updated daemon documentation to clarify that live-restore is not suppoted on windows 

Review comment implementation

Signed-off-by: bbayani <bhumikabayani@gmail.com>
This commit is contained in:
bbayani 2016-11-14 09:56:03 +00:00 committed by Tibor Vass
parent 0ceda7965d
commit 00f00e726e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ Options:
--iptables Enable addition of iptables rules (default true) --iptables Enable addition of iptables rules (default true)
--ipv6 Enable IPv6 networking --ipv6 Enable IPv6 networking
--label value Set key=value labels to the daemon (default []) --label value Set key=value labels to the daemon (default [])
--live-restore Enable live restore of docker when containers are still running --live-restore Enable live restore of docker when containers are still running (Linux only)
--log-driver string Default driver for container logs (default "json-file") --log-driver string Default driver for container logs (default "json-file")
-l, --log-level string Set the logging level ("debug", "info", "warn", "error", "fatal") (default "info") -l, --log-level string Set the logging level ("debug", "info", "warn", "error", "fatal") (default "info")
--log-opt value Default log driver options for containers (default map[]) --log-opt value Default log driver options for containers (default map[])
@ -1234,7 +1234,6 @@ This is a full example of the allowed configuration options on Windows:
"storage-driver": "", "storage-driver": "",
"storage-opts": [], "storage-opts": [],
"labels": [], "labels": [],
"live-restore": true,
"log-driver": "", "log-driver": "",
"mtu": 0, "mtu": 0,
"pidfile": "", "pidfile": "",

2
man/dockerd.8.md
View File

@ -217,7 +217,7 @@ is `hyperv`. Linux only supports `default`.
Set key=value labels to the daemon (displayed in `docker info`) Set key=value labels to the daemon (displayed in `docker info`)
**--live-restore**=*false* **--live-restore**=*false*
Enable live restore of running containers when the daemon starts so that they are not restarted. Enable live restore of running containers when the daemon starts so that they are not restarted. This option is applicable only for docker daemon running on Linux host.
**--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*splunk*|*etwlogs*|*gcplogs*|*none*" **--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*splunk*|*etwlogs*|*gcplogs*|*none*"
Default driver for container logs. Default is `json-file`. Default driver for container logs. Default is `json-file`.