mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge branch 'docker-add-net-parameter' of https://github.com/discordianfish/ansible into discordianfish-docker-add-net-parameter
This commit is contained in:
commit
1051748ba0
1 changed files with 10 additions and 1 deletions
|
@ -183,6 +183,13 @@ options:
|
|||
default: false
|
||||
aliases: []
|
||||
version_added: "1.6"
|
||||
net:
|
||||
description:
|
||||
- Set Network mode for the container (bridge, none, container:<name|id>, host)
|
||||
required: false
|
||||
default: false
|
||||
aliases: []
|
||||
version_added: "1.11"
|
||||
author: Cove Schneider, Joshua Conner, Pavel Antonov
|
||||
requirements: [ "docker-py >= 0.3.0", "docker >= 0.10.0" ]
|
||||
'''
|
||||
|
@ -597,6 +604,7 @@ class DockerManager:
|
|||
'publish_all_ports': self.module.params.get('publish_all_ports'),
|
||||
'privileged': self.module.params.get('privileged'),
|
||||
'links': self.links,
|
||||
'network_mode': self.module.params.get('net'),
|
||||
}
|
||||
if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0 and hasattr(docker, '__version__') and docker.__version__ > '0.3.0':
|
||||
params['dns'] = self.module.params.get('dns')
|
||||
|
@ -682,7 +690,8 @@ def main():
|
|||
stdin_open = dict(default=False, type='bool'),
|
||||
tty = dict(default=False, type='bool'),
|
||||
lxc_conf = dict(default=None, type='list'),
|
||||
name = dict(default=None)
|
||||
name = dict(default=None),
|
||||
net = dict(default=None)
|
||||
)
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in a new issue