diff options
| author | Joffrey F <joffrey@docker.com> | 2018-01-31 17:26:51 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-01-31 17:28:53 -0800 |
| commit | 9a87f80f85557ee3ef808677f982548b33a490c8 (patch) | |
| tree | 87f97de6b2fae79782157404f17c2e1024c1b06e | |
| parent | 3aba34fd0896b4c68186abdb150e5ac42d74d0d1 (diff) | |
| download | docker-py-3.0.0-release.tar.gz | |
Docs fixes3.0.0-release
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | docker/models/containers.py | 1 | ||||
| -rw-r--r-- | docs/images.rst | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/docker/models/containers.py b/docker/models/containers.py index a674393..107a020 100644 --- a/docker/models/containers.py +++ b/docker/models/containers.py @@ -592,6 +592,7 @@ class ContainerCollection(Collection): - ``container:<name|id>`` Reuse another container's network stack. - ``host`` Use the host network stack. + Incompatible with ``network``. oom_kill_disable (bool): Whether to disable OOM killer. oom_score_adj (int): An integer value containing the score given diff --git a/docs/images.rst b/docs/images.rst index 3ba0601..12b0fd1 100644 --- a/docs/images.rst +++ b/docs/images.rst @@ -26,14 +26,16 @@ Image objects .. autoclass:: Image() -.. py:attribute:: attrs -.. autoattribute:: id -.. autoattribute:: labels -.. autoattribute:: short_id -.. autoattribute:: tags + .. py:attribute:: attrs The raw representation of this object from the server. + .. autoattribute:: id + .. autoattribute:: labels + .. autoattribute:: short_id + .. autoattribute:: tags + + .. automethod:: history .. automethod:: reload |