From 24d706ad7c7afbe499f2b4c6c8a0cdab511a808d Mon Sep 17 00:00:00 2001
From: Olivier <obierlaire@gmail.com>
Date: Thu, 15 Jul 2021 16:26:16 +0200
Subject: [PATCH] Pin containerd for centos and ubuntu

---
 tasks/base/CentOS-8/install_docker.yml | 9 +--------
 vars/os_CentOS_7.yml                   | 6 +++---
 vars/os_CentOS_8.yml                   | 6 +++---
 vars/os_Ubuntu_16.yml                  | 6 +++---
 vars/os_Ubuntu_18.yml                  | 6 +++---
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/tasks/base/CentOS-8/install_docker.yml b/tasks/base/CentOS-8/install_docker.yml
index 361c546..6e4008e 100755
--- a/tasks/base/CentOS-8/install_docker.yml
+++ b/tasks/base/CentOS-8/install_docker.yml
@@ -26,21 +26,14 @@
     name: "{{ docker_version_map[docker_version]['name'] }}"
     description: "Docker repository"
     file: docker-ce
-    baseurl: https://download.docker.com/linux/centos/7/x86_64/stable
+    baseurl: "{{ docker_version_map[docker_version]['repo'] }}"
     enabled: yes
     gpgcheck: no
-  when: docker_version == '19.03'
   register: repo_installed
   retries: 10
   delay: 30
   until: repo_installed is success
 
-- name: Install containerd separately (CentOS 8).
-  package:
-    name: https://download.docker.com/linux/centos/7/x86_64/stable/Packages/containerd.io-1.2.13-3.2.el7.x86_64.rpm
-    state: present
-  when: ansible_distribution_major_version | int == 8
-
 - name: Install docker
   package:
     name: "{{ docker_version_map[docker_version]['package'] }}"
diff --git a/vars/os_CentOS_7.yml b/vars/os_CentOS_7.yml
index 43eb843..0903ea3 100644
--- a/vars/os_CentOS_7.yml
+++ b/vars/os_CentOS_7.yml
@@ -8,9 +8,9 @@ docker_version_map:
   "18.09":
     name: 'Docker-CE'
     package:
-      - docker-ce-18.09.2
-      - docker-ce-cli-18.09.2
-      - containerd.io
+      - docker-ce-18.09.9
+      - docker-ce-cli-18.09.9
+      - containerd.io-1.4.3
     repo: https://download.docker.com/linux/centos/7/x86_64/stable
     keys:
       server: https://download.docker.com/linux/centos/gpg
diff --git a/vars/os_CentOS_8.yml b/vars/os_CentOS_8.yml
index 9576de7..9984de8 100644
--- a/vars/os_CentOS_8.yml
+++ b/vars/os_CentOS_8.yml
@@ -8,9 +8,9 @@ docker_version_map:
   "19.03":
     name: 'Docker-CE'
     package:
-      - docker-ce-19.03.13
-      - docker-ce-cli-19.03.13
-      - containerd.io
+      - docker-ce-19.03.15
+      - docker-ce-cli-19.03.15
+      - containerd.io-1.4.3
     repo: https://download.docker.com/linux/centos/docker-ce.repo
     keys:
       server: https://download.docker.com/linux/centos/gpg
diff --git a/vars/os_Ubuntu_16.yml b/vars/os_Ubuntu_16.yml
index cb94ce4..27e4616 100755
--- a/vars/os_Ubuntu_16.yml
+++ b/vars/os_Ubuntu_16.yml
@@ -7,9 +7,9 @@ bootloader_update_command: update-grub
 docker_version_map:
   "18.09":
     package:
-      - docker-ce=5:18.09.2*
-      - docker-ce-cli=5:18.09.2*
-      - containerd.io
+      - docker-ce=5:18.09.9*
+      - docker-ce-cli=5:18.09.9*
+      - containerd.io=1.4.3-1*
     repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable
     keys:
       server: https://download.docker.com/linux/ubuntu/gpg
diff --git a/vars/os_Ubuntu_18.yml b/vars/os_Ubuntu_18.yml
index e02d751..21382c7 100755
--- a/vars/os_Ubuntu_18.yml
+++ b/vars/os_Ubuntu_18.yml
@@ -7,9 +7,9 @@ bootloader_update_command: update-grub
 docker_version_map:
   "19.03":
     package:
-      - docker-ce=5:19.03.13*
-      - docker-ce-cli=5:19.03.13*
-      - containerd.io
+      - docker-ce=5:19.03.15*
+      - docker-ce-cli=5:19.03.15*
+      - containerd.io=1.4.3-1*
     repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable
     keys:
       server: https://download.docker.com/linux/ubuntu/gpg