Added support for IPC namespaces, fixes GH-1689

Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
This commit is contained in:
Lachlan Pease 2015-09-06 11:55:36 +10:00
parent 6baed6c354
commit 2468235472
2 changed files with 4 additions and 1 deletions

View File

@ -36,6 +36,7 @@ DOCKER_CONFIG_KEYS = [
'extra_hosts', 'extra_hosts',
'hostname', 'hostname',
'image', 'image',
'ipc',
'labels', 'labels',
'links', 'links',
'mac_address', 'mac_address',

View File

@ -44,6 +44,7 @@ DOCKER_START_KEYS = [
'dns_search', 'dns_search',
'env_file', 'env_file',
'extra_hosts', 'extra_hosts',
'ipc',
'read_only', 'read_only',
'net', 'net',
'log_driver', 'log_driver',
@ -696,7 +697,8 @@ class Service(object):
extra_hosts=extra_hosts, extra_hosts=extra_hosts,
read_only=read_only, read_only=read_only,
pid_mode=pid, pid_mode=pid,
security_opt=security_opt security_opt=security_opt,
ipc_mode=options.get('ipc')
) )
def build(self, no_cache=False): def build(self, no_cache=False):