From 07c0075fc080759afae8aa6374c1e23ac57237c9 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Tue, 2 Jun 2020 08:43:06 -0400
Subject: [PATCH] Upgrade containerd.io and docker-ce to match ISO rpms

---
 salt/common/init.sls | 2 +-
 setup/so-functions   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index 09d71114b..deb30790e 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -101,7 +101,7 @@ heldpackages:
   pkg.installed:
     - pkgs:
       - containerd.io: 1.2.13-3.2.el7
-      - docker-ce: 3:19.03.9-3.el7
+      - docker-ce: 3:19.03.11-3.el7
     - hold: True
     - update_holds: True
 {% endif %}
diff --git a/setup/so-functions b/setup/so-functions
index 8db94e4e5..8f6716c0a 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -613,9 +613,9 @@ docker_install() {
 		{
 			yum clean expire-cache;
 			yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo;
-			yum -y install docker-ce-19.03.9-3.el7 containerd.io-1.2.6-3.el7;
-			yum versionlock docker-ce-19.03.9-3.el7;
-			yum versionlock containerd.io-1.2.6-3.el7
+			yum -y install docker-ce-19.03.11-3.el7 containerd.io-1.2.13-3.2.el7;
+			yum versionlock docker-ce-19.03.11-3.el7;
+			yum versionlock containerd.io-1.2.13-3.2.el7
 		} >> "$setup_log" 2>&1
 		
 	else