From 3f950292cf9a3b6d6697e65f986e8559bc396cf2 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Wed, 1 Feb 2017 16:57:13 +0100 Subject: [PATCH] docker buildargs require minimal dockerpy 1.6.0 and docker version 1.9.0 update version in the docs --- salt/modules/dockerng.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/salt/modules/dockerng.py b/salt/modules/dockerng.py index 87000e3846..f29108f1ba 100644 --- a/salt/modules/dockerng.py +++ b/salt/modules/dockerng.py @@ -28,13 +28,13 @@ to replace references to ``dockerng`` with ``docker``. Installation Prerequisites -------------------------- -This execution module requires at least version 1.4.0 of both docker-py_ and -Docker_. docker-py can easily be installed using :py:func:`pip.install -`: +This execution module requires at least version 1.6.0 of docker-py_ and +version 1.9.0 of Docker_. docker-py can easily be installed using +:py:func:`pip.install `: .. code-block:: bash - salt myminion pip.install docker-py>=1.4.0 + salt myminion pip.install docker-py>=1.6.0 .. _docker-py: https://pypi.python.org/pypi/docker-py .. _Docker: https://www.docker.com/ @@ -332,8 +332,8 @@ __func_alias__ = { } # Minimum supported versions -MIN_DOCKER = (1, 6, 0) -MIN_DOCKER_PY = (1, 4, 0) +MIN_DOCKER = (1, 9, 0) +MIN_DOCKER_PY = (1, 6, 0) VERSION_RE = r'([\d.]+)' -- 2.11.0