saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #29730 from rallytime/fix-24698

Browse source 
Update docker-py version requirement to 0.6.0 for dockerio.py files
This commit is contained in:
Mike Place 2015-12-16 07:44:40 -07:00
commit f43f3d166c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/dockerio.py
View file

@ -24,12 +24,12 @@ Installation Prerequisites
path that is running salt. Its version should support `Docker Remote API
v1.12 <http://docs.docker.io/en/latest/reference/api/docker_remote_api_v1.12>`_.
Currently, ``docker-py 0.5.0`` is known to support `Docker Remote API v1.12
Currently, ``docker-py 0.6.0`` is known to support `Docker Remote API v1.12
<http://docs.docker.io/en/latest/reference/api/docker_remote_api_v1.12>`_
.. code-block:: bash
pip install docker-py==0.5.0
pip install docker-py==0.6.0
Prerequisite Pillar Configuration for Authentication
----------------------------------------------------

4
salt/states/dockerio.py
View file

@ -18,8 +18,8 @@ wrapper. The base supported wrapper type is
.. note::
This state module requires
`docker-py <https://github.com/dotcloud/docker-py>`_
which supports `Docker Remote API version 1.6
`docker-py <https://github.com/dotcloud/docker-py>`_ version >= 0.6.0
which supports `Docker Remote API version 1.12
<http://docs.docker.io/en/latest/reference/api/docker_remote_api_v1.6>`_.
Available Functions