Skip to content

Move volume_driver to RUN_HOST_CONFIG_KWARGS #2288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2019
Merged

Move volume_driver to RUN_HOST_CONFIG_KWARGS #2288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Move volume_driver to RUN_HOST_CONFIG_KWARGS 
Fixes #2271

Signed-off-by: Hannes Ljungberg <[email protected]>
  • Loading branch information
@hannseman
hannseman committed Mar 23, 2019
commit 523371e21d41e5afdb800aadec123853b8c37f2b
2 changes: 1 addition & 1 deletion docker/models/containers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,6 @@ def prune(self, filters=None):
'tty',
'use_config_proxy',
'user',
'volume_driver',
'working_dir',
]

Expand Down Expand Up @@ -1028,6 +1027,7 @@ def prune(self, filters=None):
'userns_mode',
'uts_mode',
'version',
'volume_driver',
'volumes_from',
'runtime'
]
Expand Down
10 changes: 10 additions & 0 deletions tests/integration/models_containers_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,3 +378,13 @@ def test_wait(self):
detach=True)
self.tmp_containers.append(container.id)
assert container.wait()['StatusCode'] == 1

def test_create_with_volume_driver(self):
client = docker.from_env(version=TEST_API_VERSION)
container = client.containers.create(
'alpine',
'sleep 300',
volume_driver='foo'
)
self.tmp_containers.append(container.id)
assert container.attrs['HostConfig']['VolumeDriver'] == 'foo'
2 changes: 1 addition & 1 deletion tests/unit/models_containers_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ def test_create_container_args(self):
'Ulimits': [{"Name": "nofile", "Soft": 1024, "Hard": 2048}],
'UsernsMode': 'host',
'UTSMode': 'host',
'VolumeDriver': 'some_driver',
'VolumesFrom': ['container'],
},
healthcheck={'test': 'true'},
Expand All @@ -190,7 +191,6 @@ def test_create_container_args(self):
stop_signal=9,
tty=True,
user='bob',
volume_driver='some_driver',
volumes=[
'/mnt/vol2',
'/mnt/vol1',
Expand Down