diff options
author | Joffrey F <f.joffrey@gmail.com> | 2017-05-09 17:01:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-09 17:01:47 -0700 |
commit | 2bdaf7f857645244ff38defe61feecbf9af11d68 (patch) | |
tree | cb7aa45c93aa15572976546d18a4d69d2f8c3e61 | |
parent | 4e217b5cc48a89e32bf6fa9fe0217c0f6421134c (diff) | |
parent | bf60e2a330f964c43cc379ead6c209adaa4c74f4 (diff) | |
download | docker-py-2bdaf7f857645244ff38defe61feecbf9af11d68.tar.gz |
Merge pull request #1598 from docker/init_path_removed
init_path removed in Engine 17.05
-rw-r--r-- | docker/types/containers.py | 4 | ||||
-rw-r--r-- | tests/integration/api_container_test.py | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/docker/types/containers.py b/docker/types/containers.py index 06d0ee4..18d1838 100644 --- a/docker/types/containers.py +++ b/docker/types/containers.py @@ -438,6 +438,10 @@ class HostConfig(dict): if init_path is not None: if version_lt(version, '1.25'): raise host_config_version_error('init_path', '1.25') + + if version_gte(version, '1.29'): + # https://github.com/moby/moby/pull/32470 + raise host_config_version_error('init_path', '1.29', False) self['InitPath'] = init_path if volume_driver is not None: diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py index 9514261..fb4c4e4 100644 --- a/tests/integration/api_container_test.py +++ b/tests/integration/api_container_test.py @@ -451,6 +451,7 @@ class CreateContainerTest(BaseAPIIntegrationTest): config = self.client.inspect_container(ctnr) assert config['HostConfig']['Init'] is True + @pytest.mark.xfail(True, reason='init-path removed in 17.05.0') @requires_api_version('1.25') def test_create_with_init_path(self): ctnr = self.client.create_container( |