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 #1663 from shin-/qazbnm456-correct_description_of_dns_opt_of_create_container 

Correct the description of dns_opt option of create_container
This commit is contained in:
Joffrey F 2017-06-22 12:39:32 -07:00 committed by GitHub
parent b9e5863e48 015fe1cf5e
commit 28e76a6fbc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/api/container.py
View File

@ -391,8 +391,6 @@ class ContainerApiMixin(object):
``{"PASSWORD": "xxx"}``. ``{"PASSWORD": "xxx"}``.
dns (:py:class:`list`): DNS name servers. Deprecated since API dns (:py:class:`list`): DNS name servers. Deprecated since API
version 1.10. Use ``host_config`` instead. 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 volumes (str or list): List of paths inside the container to use
as volumes. as volumes.
volumes_from (:py:class:`list`): List of container names or Ids to 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 to have read-write access to the host's ``/dev/sda`` via a
node named ``/dev/xvda`` inside the container. node named ``/dev/xvda`` inside the container.
dns (:py:class:`list`): Set custom DNS servers. 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. dns_search (:py:class:`list`): DNS search domains.
extra_hosts (dict): Addtional hostnames to resolve inside the extra_hosts (dict): Addtional hostnames to resolve inside the
container, as a mapping of hostname to IP address. container, as a mapping of hostname to IP address.