From 3f884a6edd9c6c398519fb511a5f5f4ec27b00a9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 11 Dec 2019 08:38:14 -0600
Subject: [PATCH 1/3] Issue #171: Test for CentOS 8.

---
 .travis.yml   | 1 +
 meta/main.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c67ceb5..2ba8fe7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ env:
   global:
     - ROLE_NAME: docker
   matrix:
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
diff --git a/meta/main.yml b/meta/main.yml
index b08fb6f..84c78b0 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -10,8 +10,8 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
         - 7
+        - 8
     - name: Fedora
       versions:
         - all

From 368226babd32d03daa6f91c74859c72a494b1869 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 11 Dec 2019 08:47:58 -0600
Subject: [PATCH 2/3] Attempt to manually install containerd on CentOS 8 for
 now.

---
 tasks/setup-RedHat.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml
index 0cd1a50..df15519 100644
--- a/tasks/setup-RedHat.yml
+++ b/tasks/setup-RedHat.yml
@@ -33,3 +33,9 @@
     section: 'docker-{{ docker_edition }}-test'
     option: enabled
     value: '{{ docker_yum_repo_enable_test }}'
+
+- name: Install containerd separately (CentOS 8).
+  package:
+    name: https://download.docker.com/linux/centos/7/x86_64/stable/Packages/containerd.io-1.2.6-3.3.el7.x86_64.rpm
+    state: present
+  when: ansible_distribution_major_version | int == 8

From 3cba7a9e6fad87ba8bcbd0d718ec6a7c14a5d0da Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 11 Dec 2019 09:27:09 -0600
Subject: [PATCH 3/3] Fix int to string implicit conversion issue.

---
 README.md         | 4 ++--
 defaults/main.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9a49840..9179908 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ Docker Compose installation options.
 (Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release.
 
     docker_yum_repo_url: https://download.docker.com/linux/centos/docker-{{ docker_edition }}.repo
-    docker_yum_repo_enable_edge: 0
-    docker_yum_repo_enable_test: 0
+    docker_yum_repo_enable_edge: '0'
+    docker_yum_repo_enable_test: '0'
 
 (Used only for RedHat/CentOS.) You can enable the Edge or Test repo by setting the respective vars to `1`.
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 3a9cc47..5f670c6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -22,8 +22,8 @@ docker_apt_ignore_key_error: true
 
 # Used only for RedHat/CentOS/Fedora.
 docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo
-docker_yum_repo_enable_edge: 0
-docker_yum_repo_enable_test: 0
+docker_yum_repo_enable_edge: '0'
+docker_yum_repo_enable_test: '0'
 
 # A list of users who will be added to the docker group.
 docker_users: []