From 907c3ce42b6f1033546e1cb6cd17aa801b035463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jure=20=C5=BDvelc?= <jure.zvelc@dlabs.si>
Date: Wed, 20 Jan 2016 13:01:04 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20for=20extending=20services=20written=20in?=
 =?UTF-8?q?=20v2=20format.=20Signed-off-by:=20Jure=20=C5=BDvelc=20<jzvelc@?=
 =?UTF-8?q?gmail.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose/config/config.py         | 12 ++++++++----
 tests/unit/config/config_test.py | 24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index ac5e8d174..2f513fb5e 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -134,6 +134,9 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
             return 1
         return version
 
+    def get_service(self, name):
+        return self.get_service_dicts()[name]
+
     def get_service_dicts(self):
         return self.config if self.version == 1 else self.config.get('services', {})
 
@@ -351,19 +354,19 @@ def process_config_file(config_file, service_name=None):
 
     if config_file.version == 2:
         processed_config = dict(config_file.config)
-        processed_config['services'] = interpolated_config
+        processed_config['services'] = services = interpolated_config
         processed_config['volumes'] = interpolate_environment_variables(
             config_file.get_volumes(), 'volume')
         processed_config['networks'] = interpolate_environment_variables(
             config_file.get_networks(), 'network')
 
     if config_file.version == 1:
-        processed_config = interpolated_config
+        processed_config = services = interpolated_config
 
     config_file = config_file._replace(config=processed_config)
     validate_against_fields_schema(config_file)
 
-    if service_name and service_name not in processed_config:
+    if service_name and service_name not in services:
         raise ConfigurationError(
             "Cannot extend service '{}' in {}: Service not found".format(
                 service_name, config_file.filename))
@@ -408,7 +411,8 @@ class ServiceExtendsResolver(object):
         extended_file = process_config_file(
             extends_file,
             service_name=service_name)
-        service_config = extended_file.config[service_name]
+        service_config = extended_file.get_service(service_name)
+
         return config_path, service_config, service_name
 
     def resolve_extends(self, extended_config_path, service_dict, service_name):
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index cc2051363..b5164adef 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1911,6 +1911,30 @@ class ExtendsTest(unittest.TestCase):
             load_from_filename(str(tmpdir.join('docker-compose.yml')))
         assert 'Version mismatch' in exc.exconly()
 
+    def test_extends_with_defined_version_passes(self):
+        tmpdir = py.test.ensuretemp('test_extends_with_defined_version')
+        self.addCleanup(tmpdir.remove)
+        tmpdir.join('docker-compose.yml').write("""
+            version: 2
+            services:
+              web:
+                extends:
+                  file: base.yml
+                  service: base
+                image: busybox
+        """)
+        tmpdir.join('base.yml').write("""
+            version: 2
+            services:
+                base:
+                  volumes: ['/foo']
+                  ports: ['3000:3000']
+                  command: top
+        """)
+
+        service = load_from_filename(str(tmpdir.join('docker-compose.yml')))
+        self.assertEquals(service[0]['command'], "top")
+
 
 @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
 class ExpandPathTest(unittest.TestCase):