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

reviewable/pr18780/r1
Ryan Walls 9 years ago
parent 5f1d88a829
commit c95717afe5

@ -100,6 +100,7 @@ options:
"none" disables any logging for the container. docker logs won't be available with this driver. "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. "syslog" Syslog logging driver for Docker. Writes log messages to syslog.
docker logs command is not available for this logging driver. 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. Requires docker >= 1.6.0.
required: false required: false
default: json-file default: json-file
@ -1510,7 +1511,7 @@ def main():
net = dict(default=None), net = dict(default=None),
pid = dict(default=None), pid = dict(default=None),
insecure_registry = dict(default=False, type='bool'), 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 = ( required_together = (
['tls_client_cert', 'tls_client_key'], ['tls_client_cert', 'tls_client_key'],

Loading…
Cancel
Save