Don't expand volume names

Only expand volume host paths if they begin with a dot.

This is a breaking change. The deprecation warning preparing users for
this change has been removed.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

compose/config/config.py

@@ -78,13 +78,6 @@ SUPPORTED_FILENAMES = [
 
 DEFAULT_OVERRIDE_FILENAME = 'docker-compose.override.yml'
 
-PATH_START_CHARS = [
-    '/',
-    '.',
-    '~',
-]
-
-
 log = logging.getLogger(__name__)
 
 
@@ -495,18 +488,10 @@ def resolve_volume_path(volume, working_dir, service_name):
     container_path = os.path.expanduser(container_path)
 
     if host_path is not None:
-        if not any(host_path.startswith(c) for c in PATH_START_CHARS):
+        if host_path.startswith('.'):
-            log.warn(
+            host_path = expand_path(working_dir, host_path)
-                'Warning: the mapping "{0}:{1}" in the volumes config for '
-                'service "{2}" is ambiguous. In a future version of Docker, '
-                'it will designate a "named" volume '
-                '(see https://github.com/docker/docker/pull/14242). '
-                'To prevent unexpected behaviour, change it to "./{0}:{1}"'
-                .format(host_path, container_path, service_name)
-            )
-
         host_path = os.path.expanduser(host_path)
-        return "%s:%s" % (expand_path(working_dir, host_path), container_path)
+        return "{}:{}".format(host_path, container_path)
     else:
         return container_path
 

tests/unit/config/config_test.py

@@ -414,6 +414,12 @@ class InterpolationTest(unittest.TestCase):
         self.assertIn('in service "web"', cm.exception.msg)
         self.assertIn('"${"', cm.exception.msg)
 
+
+class VolumeConfigTest(unittest.TestCase):
+    def test_no_binding(self):
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['/data']}, working_dir='.')
+        self.assertEqual(d['volumes'], ['/data'])
+
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')
     @mock.patch.dict(os.environ)
     def test_volume_binding_with_environment_variable(self):
@@ -434,59 +440,39 @@ class InterpolationTest(unittest.TestCase):
         d = make_service_dict('foo', {'build': '.', 'volumes': ['~:/container/path']}, working_dir='.')
         self.assertEqual(d['volumes'], ['/home/user:/container/path'])
 
-    @mock.patch.dict(os.environ)
+    def test_name_does_not_expand(self):
-    def test_volume_binding_with_local_dir_name_raises_warning(self):
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['mydatavolume:/data']}, working_dir='.')
-        def make_dict(**config):
+        self.assertEqual(d['volumes'], ['mydatavolume:/data'])
-            config['build'] = '.'
-            make_service_dict('foo', config, working_dir='.')
 
-        with mock.patch('compose.config.config.log.warn') as warn:
+    def test_absolute_posix_path_does_not_expand(self):
-            make_dict(volumes=['/container/path'])
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['/var/lib/data:/data']}, working_dir='.')
-            self.assertEqual(0, warn.call_count)
+        self.assertEqual(d['volumes'], ['/var/lib/data:/data'])
 
-            make_dict(volumes=['/data:/container/path'])
+    def test_absolute_windows_path_does_not_expand(self):
-            self.assertEqual(0, warn.call_count)
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['C:\\data:/data']}, working_dir='.')
+        self.assertEqual(d['volumes'], ['C:\\data:/data'])
 
-            make_dict(volumes=['.:/container/path'])
+    @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='posix paths')
-            self.assertEqual(0, warn.call_count)
+    def test_relative_path_does_expand_posix(self):
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['./data:/data']}, working_dir='/home/me/myproject')
+        self.assertEqual(d['volumes'], ['/home/me/myproject/data:/data'])
 
-            make_dict(volumes=['..:/container/path'])
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['.:/data']}, working_dir='/home/me/myproject')
-            self.assertEqual(0, warn.call_count)
+        self.assertEqual(d['volumes'], ['/home/me/myproject:/data'])
 
-            make_dict(volumes=['./data:/container/path'])
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['../otherproject:/data']}, working_dir='/home/me/myproject')
-            self.assertEqual(0, warn.call_count)
+        self.assertEqual(d['volumes'], ['/home/me/otherproject:/data'])
 
-            make_dict(volumes=['../data:/container/path'])
+    @pytest.mark.skipif(not IS_WINDOWS_PLATFORM, reason='windows paths')
-            self.assertEqual(0, warn.call_count)
+    def test_relative_path_does_expand_windows(self):
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['./data:/data']}, working_dir='C:\\Users\\me\\myproject')
+        self.assertEqual(d['volumes'], ['C:\\Users\\me\\myproject\\data:/data'])
 
-            make_dict(volumes=['.profile:/container/path'])
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['.:/data']}, working_dir='C:\\Users\\me\\myproject')
-            self.assertEqual(0, warn.call_count)
+        self.assertEqual(d['volumes'], ['C:\\Users\\me\\myproject:/data'])
 
-            make_dict(volumes=['~:/container/path'])
+        d = make_service_dict('foo', {'build': '.', 'volumes': ['../otherproject:/data']}, working_dir='C:\\Users\\me\\myproject')
-            self.assertEqual(0, warn.call_count)
+        self.assertEqual(d['volumes'], ['C:\\Users\\me\\otherproject:/data'])
-
-            make_dict(volumes=['~/data:/container/path'])
-            self.assertEqual(0, warn.call_count)
-
-            make_dict(volumes=['~tmp:/container/path'])
-            self.assertEqual(0, warn.call_count)
-
-            make_dict(volumes=['data:/container/path'], volume_driver='mydriver')
-            self.assertEqual(0, warn.call_count)
-
-            make_dict(volumes=['data:/container/path'])
-            self.assertEqual(1, warn.call_count)
-            warning = warn.call_args[0][0]
-            self.assertIn('"data:/container/path"', warning)
-            self.assertIn('"./data:/container/path"', warning)
-
-    def test_named_volume_with_driver_does_not_expand(self):
-        d = make_service_dict('foo', {
-            'build': '.',
-            'volumes': ['namedvolume:/data'],
-            'volume_driver': 'foodriver',
-        }, working_dir='.')
-        self.assertEqual(d['volumes'], ['namedvolume:/data'])
 
     @mock.patch.dict(os.environ)
     def test_home_directory_with_driver_does_not_expand(self):