docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #230 from dotcloud/dns_search_support 

Added dns_search parameter to client.start()
This commit is contained in:
Joffrey F 2014-05-27 16:35:30 -07:00
parent 78eac11e2f 39d2a81cf6
commit 1e8009b8de
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -214,7 +214,7 @@ Identical to the `docker search` command.
```python ```python
c.start(container, binds=None, port_bindings=None, lxc_conf=None, c.start(container, binds=None, port_bindings=None, lxc_conf=None,
publish_all_ports=False, links=None, privileged=False, publish_all_ports=False, links=None, privileged=False,
dns=None, volumes_from=None, network_mode=None) dns=None, dns_search=None, volumes_from=None, network_mode=None)
``` ```
Similar to the `docker start` command, but doesn't support attach Similar to the `docker start` command, but doesn't support attach

5
docker/client.py
View File

@ -715,7 +715,7 @@ class Client(requests.Session):
def start(self, container, binds=None, port_bindings=None, lxc_conf=None, def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
publish_all_ports=False, links=None, privileged=False, publish_all_ports=False, links=None, privileged=False,
dns=None, volumes_from=None, network_mode=None): dns=None, dns_search=None, volumes_from=None, network_mode=None):
if isinstance(container, dict): if isinstance(container, dict):
container = container.get('Id') container = container.get('Id')
@ -769,6 +769,9 @@ class Client(requests.Session):
warnings.warn(warning_message.format('volumes_from'), warnings.warn(warning_message.format('volumes_from'),
DeprecationWarning) DeprecationWarning)
if dns_search:
start_config['DnsSearch'] = dns_search
if network_mode: if network_mode:
start_config['NetworkMode'] = network_mode start_config['NetworkMode'] = network_mode