Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into issue/286

salt/common/init.sls

@@ -88,7 +88,7 @@ heldpackages:
   pkg.installed:
     - pkgs:
       - containerd.io: 1.2.13-2
-      - docker-ce: 5:19.03.9~3-0~ubuntu-bionic
+      - docker-ce: 5:19.03.12~3-0~ubuntu-bionic
     - hold: True
     - update_holds: True
 
@@ -124,7 +124,7 @@ heldpackages:
   pkg.installed:
     - pkgs:
       - containerd.io: 1.2.13-3.2.el7
-      - docker-ce: 3:19.03.11-3.el7
+      - docker-ce: 3:19.03.12-3.el7
     - hold: True
     - update_holds: True
 {% endif %}
@@ -186,3 +186,8 @@ sensorrotateconf:
     - dayweek: '*'
 
 {% endif %}
+
+# Make sure Docker is always running
+docker:
+  service.running:
+    - enable: True

salt/top.sls

@@ -33,8 +33,8 @@ base:
     - match: compound
     - ca
     - ssl
-    - registry
     - common
+    - registry
     - telegraf
     - firewall
     - idstools
@@ -74,9 +74,9 @@ base:
     - match: compound
     - ca
     - ssl
+    - common
     - registry
     - manager
-    - common
     - nginx
     - telegraf
     - influxdb
@@ -131,8 +131,8 @@ base:
     - match: compound
     - ca
     - ssl
-    - registry
     - common
+    - registry
     - nginx
     - telegraf
     - influxdb
@@ -179,9 +179,9 @@ base:
     - match: compound
     - ca
     - ssl
+    - common
     - registry
     - manager
-    - common
     - nginx
     - telegraf
     - influxdb
@@ -303,8 +303,8 @@ base:
     - match: compound
     - ca
     - ssl
-    - registry
     - common
+    - registry
     - nginx
     - telegraf
     - influxdb
@@ -395,9 +395,9 @@ base:
     - match: compound
     - ca
     - ssl
+    - common
     - registry
     - manager
-    - common
     - nginx
     - soc
     - firewall

setup/so-functions

@@ -752,9 +752,9 @@ docker_install() {
 			  yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo;
 			fi
 			if [[ ! $is_iso ]]; then
-			  yum -y install docker-ce-19.03.11-3.el7 containerd.io-1.2.13-3.2.el7;
+			  yum -y install docker-ce-19.03.12-3.el7 containerd.io-1.2.13-3.2.el7;
 			fi
-			yum versionlock docker-ce-19.03.11-3.el7;
+			yum versionlock docker-ce-19.03.12-3.el7;
 			yum versionlock containerd.io-1.2.13-3.2.el7
 		} >> "$setup_log" 2>&1