Add support for log-driver in docker-compose.yml

Closes #1303

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2015-05-06 13:18:58 +02:00
commit f626fc5ce8
5 changed files with 41 additions and 1 deletions

View file

@ -23,6 +23,7 @@ DOCKER_CONFIG_KEYS = [
'links',
'mem_limit',
'net',
'log_driver',
'pid',
'ports',
'privileged',

View file

@ -83,6 +83,10 @@ class Container(object):
def labels(self):
return self.get('Config.Labels') or {}
@property
def log_config(self):
return self.get('HostConfig.LogConfig') or None
@property
def human_readable_state(self):
if self.is_running:

View file

@ -8,7 +8,7 @@ import sys
import six
from docker.errors import APIError
from docker.utils import create_host_config
from docker.utils import create_host_config, LogConfig
from .config import DOCKER_CONFIG_KEYS
from .container import Container, get_container_name
@ -25,6 +25,7 @@ DOCKER_START_KEYS = [
'env_file',
'extra_hosts',
'net',
'log_driver',
'pid',
'privileged',
'restart',
@ -429,6 +430,7 @@ 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'))
pid = options.get('pid', None)
dns = options.get('dns', None)
@ -455,6 +457,7 @@ class Service(object):
restart_policy=restart,
cap_add=cap_add,
cap_drop=cap_drop,
log_config=log_config,
extra_hosts=extra_hosts,
pid_mode=pid
)