Browse code

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

Signed-off-by: bbayani <bhumikabayani@gmail.com>

bbayani authored on 2016/11/14 18:56:03
Showing 2 changed files
... ...
@@ -62,7 +62,7 @@ Options:
62 62
       --iptables                              Enable addition of iptables rules (default true)
63 63
       --ipv6                                  Enable IPv6 networking
64 64
       --label value                           Set key=value labels to the daemon (default [])
65
-      --live-restore                          Enable live restore of docker when containers are still running
65
+      --live-restore                          Enable live restore of docker when containers are still running (Linux only)
66 66
       --log-driver string                     Default driver for container logs (default "json-file")
67 67
   -l, --log-level string                      Set the logging level ("debug", "info", "warn", "error", "fatal") (default "info")
68 68
       --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:
1234 1234
     "storage-driver": "",
1235 1235
     "storage-opts": [],
1236 1236
     "labels": [],
1237
-    "live-restore": true,
1238 1237
     "log-driver": "",
1239 1238
     "mtu": 0,
1240 1239
     "pidfile": "",
... ...
@@ -217,7 +217,7 @@ is `hyperv`. Linux only supports `default`.
217 217
   Set key=value labels to the daemon (displayed in `docker info`)
218 218
 
219 219
 **--live-restore**=*false*
220
-  Enable live restore of running containers when the daemon starts so that they are not restarted.
220
+  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.
221 221
 
222 222
 **--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*splunk*|*etwlogs*|*gcplogs*|*none*"
223 223
   Default driver for container logs. Default is `json-file`.