Support option none in docker_container when setting log_driver (#19040)

Per official docker document, it support setting `--log-driver=none` to
disable any logging for the container. So let's add it to this module.

Fixes #5337
pull/20256/merge
Jun Guo 8 years ago committed by Ryan Brown
parent 61243f0d99
commit cfed617dba

@ -207,6 +207,7 @@ options:
description: description:
- Specify the logging driver. Docker uses json-file by default. - Specify the logging driver. Docker uses json-file by default.
choices: choices:
- none
- json-file - json-file
- syslog - syslog
- journald - journald
@ -1961,7 +1962,9 @@ def main():
kill_signal=dict(type='str'), kill_signal=dict(type='str'),
labels=dict(type='dict'), labels=dict(type='dict'),
links=dict(type='list'), links=dict(type='list'),
log_driver=dict(type='str', choices=['json-file', 'syslog', 'journald', 'gelf', 'fluentd', 'awslogs', 'splunk'], default=None), log_driver=dict(type='str',
choices=['none', 'json-file', 'syslog', 'journald', 'gelf', 'fluentd', 'awslogs', 'splunk'],
default=None),
log_options=dict(type='dict', aliases=['log_opt']), log_options=dict(type='dict', aliases=['log_opt']),
mac_address=dict(type='str'), mac_address=dict(type='str'),
memory=dict(type='str', default='0'), memory=dict(type='str', default='0'),

Loading…
Cancel
Save