Merge pull request #1995 from predakanga/master
Added support for IPC namespaces, fixes GH-1689
This commit is contained in:
commit
1c823597bb
4 changed files with 8 additions and 2 deletions
|
|
@ -36,6 +36,7 @@ DOCKER_CONFIG_KEYS = [
|
|||
'extra_hosts',
|
||||
'hostname',
|
||||
'image',
|
||||
'ipc',
|
||||
'labels',
|
||||
'links',
|
||||
'log_driver',
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@
|
|||
"external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
|
||||
"hostname": {"type": "string"},
|
||||
"image": {"type": "string"},
|
||||
"ipc": {"type": "string"},
|
||||
"labels": {"$ref": "#/definitions/list_or_dict"},
|
||||
"links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
|
||||
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ DOCKER_START_KEYS = [
|
|||
'dns_search',
|
||||
'env_file',
|
||||
'extra_hosts',
|
||||
'ipc',
|
||||
'read_only',
|
||||
'net',
|
||||
'log_driver',
|
||||
|
|
@ -697,7 +698,8 @@ class Service(object):
|
|||
extra_hosts=extra_hosts,
|
||||
read_only=read_only,
|
||||
pid_mode=pid,
|
||||
security_opt=security_opt
|
||||
security_opt=security_opt,
|
||||
ipc_mode=options.get('ipc')
|
||||
)
|
||||
|
||||
def build(self, no_cache=False):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue