internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[docker] Add compatibility with docker-py v2.0

Browse Source
This commit is contained in:
dariko
2016-12-20 14:55:03 +01:00
committed by Ryan S. Brown
parent 339312a6b4
commit e2a1ce2916
4 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ansible/modules/cloud/docker/docker_image.py
View File

@@ -250,7 +250,10 @@ image:
from ansible.module_utils.docker_common import *
try:
from docker.auth.auth import resolve_repository_name
if HAS_DOCKER_PY_2:
from docker.auth import resolve_repository_name
else:
from docker.auth.auth import resolve_repository_name
from docker.utils.utils import parse_repository_tag
except ImportError:
# missing docker-py handled in docker_common