CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-18 15:02:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2249 from Security-Onion-Solutions/issue/2188

Browse Source 
Issue/2188
This commit is contained in:
Josh Patterson
2020-12-07 16:52:34 -05:00
committed by GitHub
parent 35ea6c36d2 b5e0b21400
commit 2d9c6a42bf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/common/init.sls
View File

@@ -111,7 +111,7 @@ heldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.2.13-2 - containerd.io: 1.2.13-2
- docker-ce: 5:19.03.12~3-0~ubuntu-bionic - docker-ce: 5:19.03.14~3-0~ubuntu-bionic
- hold: True - hold: True
- update_holds: True - update_holds: True
@@ -147,7 +147,7 @@ heldpackages:
pkg.installed: pkg.installed:
- pkgs: - pkgs:
- containerd.io: 1.2.13-3.2.el7 - containerd.io: 1.2.13-3.2.el7
- docker-ce: 3:19.03.12-3.el7 - docker-ce: 3:19.03.14-3.el7
- hold: True - hold: True
- update_holds: True - update_holds: True
{% endif %} {% endif %}

4
setup/so-functions
View File

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