volume: do not strip trailing characters from names (#3073)

Only remove `:ro` or `:rw` suffixes in their entirety; do not
strip arbitrary `r` / `o` / `w` / `:` characters individually.

Signed-off-by: Loïc Leyendecker <loic.leyendecker@gmail.com>

docker/models/containers.py

@@ -1147,8 +1147,10 @@ def _host_volume_from_bind(bind):
     bits = rest.split(':', 1)
     if len(bits) == 1 or bits[1] in ('ro', 'rw'):
         return drive + bits[0]
+    elif bits[1].endswith(':ro') or bits[1].endswith(':rw'):
+        return bits[1][:-3]
     else:
-        return bits[1].rstrip(':ro').rstrip(':rw')
+        return bits[1]
 
 
 ExecResult = namedtuple('ExecResult', 'exit_code,output')

tests/unit/models_containers_test.py

@@ -103,7 +103,7 @@ def test_create_container_args(self):
             volumes=[
                 '/home/user1/:/mnt/vol2',
                 '/var/www:/mnt/vol1:ro',
-                'volumename:/mnt/vol3',
+                'volumename:/mnt/vol3r',
                 '/volumewithnohostpath',
                 '/anothervolumewithnohostpath:ro',
                 'C:\\windows\\path:D:\\hello\\world:rw'
@@ -123,7 +123,7 @@ def test_create_container_args(self):
                 'Binds': [
                     '/home/user1/:/mnt/vol2',
                     '/var/www:/mnt/vol1:ro',
-                    'volumename:/mnt/vol3',
+                    'volumename:/mnt/vol3r',
                     '/volumewithnohostpath',
                     '/anothervolumewithnohostpath:ro',
                     'C:\\windows\\path:D:\\hello\\world:rw'
@@ -198,7 +198,7 @@ def test_create_container_args(self):
             volumes=[
                 '/mnt/vol2',
                 '/mnt/vol1',
-                '/mnt/vol3',
+                '/mnt/vol3r',
                 '/volumewithnohostpath',
                 '/anothervolumewithnohostpath',
                 'D:\\hello\\world'