Default 'json-file' logging driver and none logging driver

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 47a6afb93f7f71c7ef7dc692c0f50ac81b5a8c98
Component: engine
This commit is contained in:
Alexander Morozov
2015-02-04 11:04:58 -08:00
parent 16d307ce0f
commit 0f5871ff56
13 changed files with 242 additions and 50 deletions

View File

@ -97,6 +97,7 @@ expect an integer, and they can only be specified once.
--ipv6=false Enable IPv6 networking
-l, --log-level="info" Set the logging level
--label=[] Set key=value labels to the daemon
--log-driver="json-file" Container's logging driver (json-file/none)
--mtu=0 Set the containers network MTU
-p, --pidfile="/var/run/docker.pid" Path to use for daemon PID file
--registry-mirror=[] Preferred Docker registry mirror
@ -792,6 +793,7 @@ Creates a new container.
-i, --interactive=false Keep STDIN open even if not attached
--ipc="" IPC namespace to use
--link=[] Add link to another container
--log-driver="" Logging driver for container
--lxc-conf=[] Add custom lxc options
-m, --memory="" Memory limit
--mac-address="" Container MAC address (e.g. 92:d0:c6:0a:29:33)
@ -1660,6 +1662,7 @@ removed before the image is removed.
-i, --interactive=false Keep STDIN open even if not attached
--ipc="" IPC namespace to use
--link=[] Add link to another container
--log-driver="" Logging driver for container
--lxc-conf=[] Add custom lxc options
-m, --memory="" Memory limit
--mac-address="" Container MAC address (e.g. 92:d0:c6:0a:29:33)