Make pid_mode parameter do minimum docker-py/docker server version checks
This commit is contained in:
parent
dfb58517fa
commit
cf9374f3ea
1 changed files with 7 additions and 2 deletions
|
@ -463,6 +463,7 @@ class DockerManager(object):
|
|||
'dns': ((0, 3, 0), '1.10'),
|
||||
'volumes_from': ((0, 3, 0), '1.10'),
|
||||
'restart_policy': ((0, 5, 0), '1.14'),
|
||||
'pid_mode': ((1, 0, 0), '1.17'),
|
||||
# Clientside only
|
||||
'insecure_registry': ((0, 5, 0), '0.0')
|
||||
}
|
||||
|
@ -1160,11 +1161,11 @@ class DockerManager(object):
|
|||
'privileged': self.module.params.get('privileged'),
|
||||
'links': self.links,
|
||||
'network_mode': self.module.params.get('net'),
|
||||
'pid_mode': self.module.params.get('pid'),
|
||||
}
|
||||
|
||||
optionals = {}
|
||||
for optional_param in ('dns', 'volumes_from', 'restart_policy', 'restart_policy_retry'):
|
||||
for optional_param in ('dns', 'volumes_from', 'restart_policy',
|
||||
'restart_policy_retry', 'pid_mode'):
|
||||
optionals[optional_param] = self.module.params.get(optional_param)
|
||||
|
||||
if optionals['dns'] is not None:
|
||||
|
@ -1181,6 +1182,10 @@ class DockerManager(object):
|
|||
if params['restart_policy']['Name'] == 'on-failure':
|
||||
params['restart_policy']['MaximumRetryCount'] = optionals['restart_policy_retry']
|
||||
|
||||
if optionals['pid_mode'] is not None:
|
||||
self.ensure_capability('pid_mode')
|
||||
params['pid_mode'] = optionals['pid_mode']
|
||||
|
||||
for i in containers:
|
||||
self.client.start(i['Id'], **params)
|
||||
self.increment_counter('started')
|
||||
|
|
Loading…
Reference in a new issue