tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove superfluous service code 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-01-11 15:39:59 -08:00
parent 46585fb8e1
commit c32991a8d4
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compose/service.py
View File

@ -510,13 +510,6 @@ class Service(object):
return volumes_from return volumes_from
def get_logging_options(self):
logging_dict = self.options.get('logging', {})
return {
'log_driver': logging_dict.get('driver', ""),
'log_opt': logging_dict.get('options', None)
}
def _get_container_create_options( def _get_container_create_options(
self, self,
override_options, override_options,
@ -530,8 +523,6 @@ class Service(object):
for k in DOCKER_CONFIG_KEYS if k in self.options) for k in DOCKER_CONFIG_KEYS if k in self.options)
container_options.update(override_options) container_options.update(override_options)
container_options.update(self.get_logging_options())
if self.custom_container_name() and not one_off: if self.custom_container_name() and not one_off:
container_options['name'] = self.custom_container_name() container_options['name'] = self.custom_container_name()
elif not container_options.get('name'): elif not container_options.get('name'):