diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2019-04-30 23:37:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 23:37:06 -0700 |
| commit | 0287cd9f2e3cb5db39a01afdba334bdd77d4b5fc (patch) | |
| tree | b316f7c19ea4f792a24ecf585a9834567aac31bc | |
| parent | 41e1c054268104df1412f413245dc4b12951143e (diff) | |
| parent | 50d475797a3866767289d81a74c1f720662004a5 (diff) | |
| download | docker-py-0287cd9f2e3cb5db39a01afdba334bdd77d4b5fc.tar.gz | |
Merge pull request #2309 from thaJeztah/remove_init_path_create
Remove init_path from create
| -rw-r--r-- | docker/api/container.py | 1 | ||||
| -rw-r--r-- | tests/integration/api_container_test.py | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/docker/api/container.py b/docker/api/container.py index 6069181..94f53ff 100644 --- a/docker/api/container.py +++ b/docker/api/container.py @@ -487,7 +487,6 @@ class ContainerApiMixin(object): IDs that the container process will run as. init (bool): Run an init inside the container that forwards signals and reaps processes - init_path (str): Path to the docker-init binary ipc_mode (str): Set the IPC mode for the container. isolation (str): Isolation technology to use. Default: ``None``. links (dict): Mapping of links using the diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py index b364f94..730c9ee 100644 --- a/tests/integration/api_container_test.py +++ b/tests/integration/api_container_test.py @@ -448,19 +448,6 @@ 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( - BUSYBOX, 'true', - host_config=self.client.create_host_config( - init_path="/usr/libexec/docker-init" - ) - ) - self.tmp_containers.append(ctnr['Id']) - config = self.client.inspect_container(ctnr) - assert config['HostConfig']['InitPath'] == "/usr/libexec/docker-init" - @requires_api_version('1.24') @pytest.mark.xfail(not os.path.exists('/sys/fs/cgroup/cpu.rt_runtime_us'), reason='CONFIG_RT_GROUP_SCHED isn\'t enabled') |