summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2014-04-28 20:49:45 +0200
committerJoffrey F <f.joffrey@gmail.com>2014-04-28 20:49:45 +0200
commit3ff1f1ed4bacac7651f61bfe2a9e2e73eeec3e30 (patch)
tree0b40e13c9f6c1d88cf32b203350ae4b21c1a6013 /README.md
parent0d2be16363ec06bff2801be8851d56f93159ac72 (diff)
parent88ee38b7dd95980d4a5bc68b5f4f938d3beca1d7 (diff)
downloaddocker-py-3ff1f1ed4bacac7651f61bfe2a9e2e73eeec3e30.tar.gz
Merge pull request #200 from ticosax/move-dns-and-volumes-from
From api 1.10 dns and volumes_from should be passed to start()
Diffstat (limited to 'README.md')
-rw-r--r--README.md11
1 files changed, 10 insertions, 1 deletions
diff --git a/README.md b/README.md
index 39bbced..6d823e9 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,11 @@ to those for the `docker run` command except it doesn't support the
attach options (`-a`). See "Port bindings" and "Using volumes" below for
more information on how to create port bindings and volume mappings.
+`volumes_from` and `dns` arguments raise TypeError exception if they are used
+against v1.10 of docker remote API. Those arguments should be passed to
+`start()` instead.
+
+
```python
c.diff(container)
```
@@ -201,7 +206,8 @@ Identical to the `docker search` command.
```python
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)
```
Similar to the `docker start` command, but doesn't support attach
@@ -218,6 +224,9 @@ can be specified with the `links` argument. They can either be
specified as a dictionary mapping name to alias or as a list of
`(name, alias)` tuples.
+`dns` and `volumes_from` are only available if they are used with version v1.10
+of docker remote API. Otherwise they are ignored.
+
```python
c.stop(container, timeout=10)
```