Skip to content

Commit c1fea8e

Browse files
authored
Merge pull request #2288 from hannseman/container-run-create-volume_driver
Move volume_driver to RUN_HOST_CONFIG_KWARGS
2 parents d38c724 + 523371e commit c1fea8e

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

docker/models/containers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,6 @@ def prune(self, filters=None):
964964
'tty',
965965
'use_config_proxy',
966966
'user',
967-
'volume_driver',
968967
'working_dir',
969968
]
970969

@@ -1028,6 +1027,7 @@ def prune(self, filters=None):
10281027
'userns_mode',
10291028
'uts_mode',
10301029
'version',
1030+
'volume_driver',
10311031
'volumes_from',
10321032
'runtime'
10331033
]

tests/integration/models_containers_test.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,3 +383,13 @@ def test_wait(self):
383383
detach=True)
384384
self.tmp_containers.append(container.id)
385385
assert container.wait()['StatusCode'] == 1
386+
387+
def test_create_with_volume_driver(self):
388+
client = docker.from_env(version=TEST_API_VERSION)
389+
container = client.containers.create(
390+
'alpine',
391+
'sleep 300',
392+
volume_driver='foo'
393+
)
394+
self.tmp_containers.append(container.id)
395+
assert container.attrs['HostConfig']['VolumeDriver'] == 'foo'

tests/unit/models_containers_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ def test_create_container_args(self):
176176
'Ulimits': [{"Name": "nofile", "Soft": 1024, "Hard": 2048}],
177177
'UsernsMode': 'host',
178178
'UTSMode': 'host',
179+
'VolumeDriver': 'some_driver',
179180
'VolumesFrom': ['container'],
180181
},
181182
healthcheck={'test': 'true'},
@@ -190,7 +191,6 @@ def test_create_container_args(self):
190191
stop_signal=9,
191192
tty=True,
192193
user='bob',
193-
volume_driver='some_driver',
194194
volumes=[
195195
'/mnt/vol2',
196196
'/mnt/vol1',

0 commit comments

Comments
 (0)