|
@@ -28,9 +28,9 @@
|
|
|
changed_when: false
|
|
|
|
|
|
- fail:
|
|
|
- msg: This playbook requires access to Docker 1.10 or later
|
|
|
- # Disable the 1.10 requirement if the user set a specific Docker version
|
|
|
- when: docker_version is not defined and (docker_upgrade is not defined or docker_upgrade | bool == True) and (pkg_check.rc == 0 and (avail_docker_version.stdout == "" or avail_docker_version.stdout | version_compare('1.10','<')))
|
|
|
+ msg: This playbook requires access to Docker 1.12 or later
|
|
|
+ # Disable the 1.12 requirement if the user set a specific Docker version
|
|
|
+ when: docker_version is not defined and (docker_upgrade is not defined or docker_upgrade | bool == True) and (pkg_check.rc == 0 and (avail_docker_version.stdout == "" or avail_docker_version.stdout | version_compare('1.12','<')))
|
|
|
|
|
|
# Default l_docker_upgrade to False, we'll set to True if an upgrade is required:
|
|
|
- set_fact:
|
|
@@ -50,4 +50,3 @@
|
|
|
set_fact:
|
|
|
docker_upgrade_nuke_images: True
|
|
|
when: l_docker_upgrade | bool and docker_upgrade_nuke_images is not defined and curr_docker_version.stdout | version_compare('1.10','<') and docker_version | version_compare('1.10','>=')
|
|
|
-
|