Преглед изворни кода

Account for aliased links Fix failing tests Signed-off-by: John Harris <[email protected]>

johnharris85 пре 9 година
родитељ
комит
f655a8af95

+ 4 - 4
compose/config/validation.py

@@ -172,11 +172,11 @@ def validate_network_mode(service_config, service_names):
 
 
 def validate_links(service_config, service_names):
-    for dependency in service_config.config.get('links', []):
-        if dependency not in service_names:
+    for link in service_config.config.get('links', []):
+        if link.split(':')[0] not in service_names:
             raise ConfigurationError(
-                "Service '{s.name}' has a link to service '{dep}' which is "
-                "undefined.".format(s=service_config, dep=dependency))
+                "Service '{s.name}' has a link to service '{link}' which is "
+                "undefined.".format(s=service_config, link=link))
 
 
 def validate_depends_on(service_config, service_names):

+ 2 - 0
tests/fixtures/extends/invalid-links.yml

@@ -1,3 +1,5 @@
+mydb:
+  build: '.'
 myweb:
   build: '.'
   extends:

+ 1 - 1
tests/unit/config/config_test.py

@@ -1366,7 +1366,7 @@ class ConfigTest(unittest.TestCase):
                 build_config_details({
                     'version': '2',
                     'services': {
-                        'web': {'image': 'busybox', 'links': ['db']},
+                        'web': {'image': 'busybox', 'links': ['db:db']},
                     },
                 })
             )