Update docker-py to docker

atosatto · Apr 15, 2020 · 5cbd922 · 5cbd922
1 parent 6ca6396
commit 5cbd922
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -112,6 +112,19 @@ State of the containerd service.
 Version of docker-compose to be installed via python-pip.
 When set to `""` the latest available version will be installed.
 
+    docker_py_package_name: "docker"
+
+Name of the python-pip package providing docker-py
+
+    docker_py_package_version: ""
+
+Version of the docker-py package to be installed.
+
+    docker_py_package_state: present
+
+Installation state of the docker-py package.
+Set it to 'latest' to upgrade the Docker CLI to the latest version.
+
     docker_group_name: "docker"
     docker_group_users:
       - "{{ ansible_user }}"

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -88,6 +88,20 @@ containerd_service_enabled: "yes"
 # By default, the latest available version will be installed.
 docker_compose_version: ""
 
+##
+# Docker-py
+##
+
+# Name of the python-pip package providing docker-py
+docker_py_package_name: "docker"
+
+# Version of the docker-py package to be installed.
+docker_py_package_version: ""
+
+# Installation state of the docker-py package.
+# Set it to 'latest' to upgrade the Docker CLI to the latest version.
+docker_py_package_state: present
+
 ##
 # Docker Users
 ##

diff --git a/tasks/setup-docker-py.yml b/tasks/setup-docker-py.yml
@@ -2,5 +2,6 @@
 
 - name: Install docker-py.
   pip:
-    name: docker-py
-    state: present
+    name: "{{ docker_py_package_name }}"
+    version: "{{ docker_py_package_version }}"
+    state: "{{ docker_py_package_state }}"
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,2 +1,2 @@
 molecule==2.22.0
-docker-py==1.10.6
+docker==4.2.0