diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2017-06-22 12:39:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-22 12:39:32 -0700 |
| commit | 28e76a6fbca3c4383f96d4aa006eecb610753e45 (patch) | |
| tree | e68f42ad4ce81a73f86cec4d172967d674422103 | |
| parent | b9e5863e4838641390473f7157a4f8e9e187cc15 (diff) | |
| parent | 015fe1cf5eacf93f965bd68b6e618adf2d9c115a (diff) | |
| download | docker-py-28e76a6fbca3c4383f96d4aa006eecb610753e45.tar.gz | |
Merge pull request #1663 from shin-/qazbnm456-correct_description_of_dns_opt_of_create_container
Correct the description of dns_opt option of create_container
| -rw-r--r-- | docker/api/container.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/api/container.py b/docker/api/container.py index 9108421..532a9c6 100644 --- a/docker/api/container.py +++ b/docker/api/container.py @@ -391,8 +391,6 @@ class ContainerApiMixin(object): ``{"PASSWORD": "xxx"}``. dns (:py:class:`list`): DNS name servers. Deprecated since API version 1.10. Use ``host_config`` instead. - dns_opt (:py:class:`list`): Additional options to be added to the - container's ``resolv.conf`` file volumes (str or list): List of paths inside the container to use as volumes. volumes_from (:py:class:`list`): List of container names or Ids to @@ -498,6 +496,8 @@ class ContainerApiMixin(object): to have read-write access to the host's ``/dev/sda`` via a node named ``/dev/xvda`` inside the container. dns (:py:class:`list`): Set custom DNS servers. + dns_opt (:py:class:`list`): Additional options to be added to the + container's ``resolv.conf`` file dns_search (:py:class:`list`): DNS search domains. extra_hosts (dict): Addtional hostnames to resolve inside the container, as a mapping of hostname to IP address. |