Merge pull request #3052 from dnephin/merge_v1_logging

Fix merging of logging options in v1 config
2016-03-02 15:03:36 -08:00 · 2016-03-02 15:03:36 -08:00 · 3f98c0716e
commit 3f98c0716e
parent f84ebf9b18 b726f508a6
2 changed files with 20 additions and 0 deletions
--- a/compose/config/config.py
+++ b/compose/config/config.py
@ -88,6 +88,8 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
    'build',
    'container_name',
    'dockerfile',
+    'log_driver',
+    'log_opt',
    'logging',
    'network_mode',
 ]