diff options
| author | Yaroslav Molochko <onorua@gmail.com> | 2015-03-30 09:29:18 +0300 |
|---|---|---|
| committer | Yaroslav Molochko <onorua@gmail.com> | 2015-03-30 09:29:18 +0300 |
| commit | 48a19c31297585a9aff720b898b9716af3baa22e (patch) | |
| tree | 866da7bb67ce1a6162b8d35fbaefed4008231c7e | |
| parent | 2f6579bf59b9e53a9c903ddd6d47a885c41fa307 (diff) | |
| download | docker-py-48a19c31297585a9aff720b898b9716af3baa22e.tar.gz | |
IPC sharing implementation
| -rw-r--r-- | docker/client.py | 8 | ||||
| -rw-r--r-- | docker/utils/utils.py | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/docker/client.py b/docker/client.py index 987e274..c20ff3f 100644 --- a/docker/client.py +++ b/docker/client.py @@ -869,7 +869,7 @@ class Client(requests.Session): publish_all_ports=False, links=None, privileged=False, dns=None, dns_search=None, volumes_from=None, network_mode=None, restart_policy=None, cap_add=None, cap_drop=None, devices=None, - extra_hosts=None, read_only=None, pid_mode=None, + extra_hosts=None, read_only=None, pid_mode=None, ipc_mode=None, security_opt=None): if utils.compare_version('1.10', self._version) < 0: @@ -887,6 +887,10 @@ class Client(requests.Session): raise errors.InvalidVersion( 'security_opt is only supported for API version >= 1.15' ) + if ipc_mode: + raise errors.InvalidVersion( + 'ipc_mode is only supported for API version >= 1.15' + ) if utils.compare_version('1.17', self._version) < 0: if read_only is not None: @@ -905,7 +909,7 @@ class Client(requests.Session): cap_drop=cap_drop, volumes_from=volumes_from, devices=devices, network_mode=network_mode, restart_policy=restart_policy, extra_hosts=extra_hosts, read_only=read_only, pid_mode=pid_mode, - security_opt=security_opt + ipc_mode=ipc_mode, security_opt=security_opt ) if isinstance(container, dict): diff --git a/docker/utils/utils.py b/docker/utils/utils.py index 47c4c95..cccb970 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -353,7 +353,8 @@ def create_host_config( publish_all_ports=False, links=None, privileged=False, dns=None, dns_search=None, volumes_from=None, network_mode=None, restart_policy=None, cap_add=None, cap_drop=None, devices=None, - extra_hosts=None, read_only=None, pid_mode=None, security_opt=None + extra_hosts=None, read_only=None, pid_mode=None, ipc_mode=None, + security_opt=None ): host_config = {} @@ -364,6 +365,9 @@ def create_host_config( elif pid_mode: host_config['PidMode'] = pid_mode + if ipc_mode: + host_config['IpcMode'] = ipc_mode + if privileged: host_config['Privileged'] = privileged |
