Set default "log_driver" option to None in docker module.

pull/4420/head
Ryan Walls 2015-05-28 11:36:20 -06:00 committed by Matt Clay
parent 0df1b01cb2
commit f5c1d8141b
1 changed files with 2 additions and 1 deletions

View File

@ -102,6 +102,7 @@ options:
"none" disables any logging for the container. docker logs won't be available with this driver.
"syslog" Syslog logging driver for Docker. Writes log messages to syslog.
docker logs command is not available for this logging driver.
If not defined explicitly, the Docker daemon's default ("json-file") will apply.
Requires docker >= 1.6.0.
required: false
default: json-file
@ -1531,7 +1532,7 @@ def main():
net = dict(default=None),
pid = dict(default=None),
insecure_registry = dict(default=False, type='bool'),
log_driver = dict(default='json-file', choices=['json-file', 'none', 'syslog']),
log_driver = dict(default=None, choices=['json-file', 'none', 'syslog']),
),
required_together = (
['tls_client_cert', 'tls_client_key'],