Merge pull request #1665 from mnowster/1648-support-log-opt

1648 support log opt

compose/config.py

@@ -24,7 +24,6 @@ DOCKER_CONFIG_KEYS = [
     'env_file',
     'environment',
     'extra_hosts',
-    'read_only',
     'hostname',
     'image',
     'labels',
@@ -34,9 +33,11 @@ DOCKER_CONFIG_KEYS = [
     'memswap_limit',
     'net',
     'log_driver',
+    'log_opt',
     'pid',
     'ports',
     'privileged',
+    'read_only',
     'restart',
     'security_opt',
     'stdin_open',

compose/service.py

@@ -40,6 +40,7 @@ DOCKER_START_KEYS = [
     'read_only',
     'net',
     'log_driver',
+    'log_opt',
     'pid',
     'privileged',
     'restart',
@@ -600,7 +601,10 @@ class Service(object):
         privileged = options.get('privileged', False)
         cap_add = options.get('cap_add', None)
         cap_drop = options.get('cap_drop', None)
-        log_config = LogConfig(type=options.get('log_driver', 'json-file'))
+        log_config = LogConfig(
+            type=options.get('log_driver', 'json-file'),
+            config=options.get('log_opt', None)
+        )
         pid = options.get('pid', None)
         security_opt = options.get('security_opt', None)