Set default log_driver to None to prevent config comparison when a log_driver is not specified. Fixes #4600.

reviewable/pr18780/r1
Chris Houseknecht 8 years ago
parent 01c4d5f99d
commit de0122fdaf
No known key found for this signature in database
GPG Key ID: 78F1698C5705A81B

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

Loading…
Cancel
Save