tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 15:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolves #455 - volumes_from a service with no containers.

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2014-08-30 11:33:25 -04:00
parent 2827786886
commit f5d43b6452
2 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fig/service.py
View File

@ -5,6 +5,7 @@ from .packages.docker.errors import APIError
import logging import logging
import re import re
import os import os
from operator import attrgetter
import sys import sys
from .container import Container from .container import Container
from .progress_stream import stream_output, StreamOutputError from .progress_stream import stream_output, StreamOutputError
@ -285,12 +286,17 @@ class Service(object):
def _get_volumes_from(self, intermediate_container=None): def _get_volumes_from(self, intermediate_container=None):
volumes_from = [] volumes_from = []
for v in self.volumes_from: for volume_source in self.volumes_from:
if isinstance(v, Service): if isinstance(volume_source, Service):
for container in v.containers(stopped=True): containers = volume_source.containers(stopped=True)
volumes_from.append(container.id)
elif isinstance(v, Container): if not containers:
volumes_from.append(v.id) volumes_from.append(volume_source.create_container().id)
else:
volumes_from.extend(map(attrgetter('id'), containers))
elif isinstance(volume_source, Container):
volumes_from.append(volume_source.id)
if intermediate_container: if intermediate_container:
volumes_from.append(intermediate_container.id) volumes_from.append(intermediate_container.id)

39
tests/unit/service_test.py
View File

@ -6,6 +6,7 @@ from .. import unittest
import mock import mock
from fig import Service from fig import Service
from fig.container import Container
from fig.service import ( from fig.service import (
ConfigError, ConfigError,
split_port, split_port,
@ -38,6 +39,44 @@ class ServiceTest(unittest.TestCase):
self.assertRaises(ConfigError, lambda: Service(name='foo', port=['8000'])) self.assertRaises(ConfigError, lambda: Service(name='foo', port=['8000']))
Service(name='foo', ports=['8000']) Service(name='foo', ports=['8000'])
def test_get_volumes_from_container(self):
container_id = 'aabbccddee'
service = Service(
'test',
volumes_from=[mock.Mock(id=container_id, spec=Container)])
self.assertEqual(service._get_volumes_from(), [container_id])
def test_get_volumes_from_intermediate_container(self):
container_id = 'aabbccddee'
service = Service('test')
container = mock.Mock(id=container_id, spec=Container)
self.assertEqual(service._get_volumes_from(container), [container_id])
def test_get_volumes_from_service_container_exists(self):
container_ids = ['aabbccddee', '12345']
from_service = mock.create_autospec(Service)
from_service.containers.return_value = [
mock.Mock(id=container_id, spec=Container)
for container_id in container_ids
]
service = Service('test', volumes_from=[from_service])
self.assertEqual(service._get_volumes_from(), container_ids)
def test_get_volumes_from_service_no_container(self):
container_id = 'abababab'
from_service = mock.create_autospec(Service)
from_service.containers.return_value = []
from_service.create_container.return_value = mock.Mock(
id=container_id,
spec=Container)
service = Service('test', volumes_from=[from_service])
self.assertEqual(service._get_volumes_from(), [container_id])
from_service.create_container.assert_called_once_with()
def test_split_port_with_host_ip(self): def test_split_port_with_host_ip(self):
internal_port, external_port = split_port("127.0.0.1:1000:2000") internal_port, external_port = split_port("127.0.0.1:1000:2000")
self.assertEqual(internal_port, "2000") self.assertEqual(internal_port, "2000")