From a81f0afd18de84d5567f6cc9ec1ef378d6485535 Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Fri, 25 Jan 2019 11:36:18 +0100
Subject: [PATCH] Fix: extend my change to support installs >=18.01

---
 tasks/docker-redhat.yml | 25 +++++++++++++++++++++++++
 tasks/main.yml          | 10 ++--------
 2 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 tasks/docker-redhat.yml

diff --git a/tasks/docker-redhat.yml b/tasks/docker-redhat.yml
new file mode 100644
index 0000000..c682a81
--- /dev/null
+++ b/tasks/docker-redhat.yml
@@ -0,0 +1,25 @@
+---
+- name: Set Docker package name
+  set_fact:
+    docker_install_name: "{{ docker_package }}{{ '-' if docker_package_version }}{{ docker_package_version|default(omit) }}"
+
+- name: Check all the facts
+  debug:
+    msg: "Package: {{ docker_install_name }}, Is bigger then 18.01: {{ docker_package_version is version('18.01', '>=') }}"
+
+- name: Install Docker 17.03 on CentOS/Redhat
+  when: docker_package_version is version('17.03', '>=') and docker_package_version is version('18.01', '<')
+  yum:
+    name:
+      - "docker-ce-selinux-{{ docker_package_version }}"
+      - "{{ docker_install_name }}"
+    conf_file: "{{ docker_yum_config }}"
+    state: "{{ docker_package_state }}"
+  notify: restart docker
+
+- name: Install Docker on CentOS/Redhat
+  when: docker_package_version is none or docker_package_version is version('18.01', '>=')
+  package:
+    name: "{{ docker_install_name }}"
+    state: "{{ docker_package_state }}"
+  notify: restart docker
diff --git a/tasks/main.yml b/tasks/main.yml
index 1fac4ef..98e12e3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,19 +5,13 @@
 - include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
-- name: Install Docker on CentOS/Redhat
+- include_tasks: docker-redhat.yml
   when: ansible_os_family == 'RedHat'
-  yum:
-    name:
-      - "docker-ce-selinux-{{ docker_package_version }}"
-      - "{{ docker_package }}-{{ docker_package_version }}"
-    conf_file: "{{ docker_yum_config }}"
-    state: "{{ docker_package_state }}"
 
 - name: Install Docker.
   when: ansible_os_family == 'Debian'
   package:
-    name: "{{ docker_package }}"
+    name: "{{ docker_package }}{{ '=' if docker_package_version }}{{ docker_package_version|default(omit) }}"
     state: "{{ docker_package_state }}"
   notify: restart docker