From 31b3563fb3608bc9b104bd6456bca84bbe8e5f81 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Sun, 24 May 2020 10:56:30 -0400
Subject: [PATCH] Fix package versions

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

diff --git a/salt/common/init.sls b/salt/common/init.sls
index a8c791c7f..17cbb1608 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -98,18 +98,18 @@ commonpkgs:
 			-	device-mapper-persistent-data
 			-	lvm2
 			-	openssl
-      - salt-minion: 2019.2.5
+      - salt-minion: 2019.2.5.el7
         - hold: True
         - update_holds: True
       {% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' or grains['role'] == 'so-helix' or grains['role'] == 'so-mastersearch' or grains['role'] == 'so-standalone' %}
-      - salt-master: 2019.2.5
+      - salt-master: 2019.2.5.el7
         - hold: True
         - update_holds: True
       {% endif %}
-      - containerd.io: 1.2.6-3
+      - containerd.io: 1.2.6-3.el7
         - hold: True
         - update_holds: True
-      - docker-ce: 19.03.9-3
+      - docker-ce: 19.03.9-3.el7
         - hold: True
         - update_holds: True
       {% endif %}%}
diff --git a/setup/so-functions b/setup/so-functions
index 702c3cebd..bf6db26be 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -583,9 +583,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 containerd.io-1.2.6-3;
-			yum versionlock docker-ce;
-			yum versionlock containerd.io
+			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
 		} >> "$setup_log" 2>&1
 		
 	else