CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6286 from Security-Onion-Solutions/fix/docker-upgrade

Browse Source 
Prevent downgrade of docker, containerd, and docker-cli
This commit is contained in:
Josh Patterson
2021-11-18 15:15:37 -05:00
committed by GitHub
parent a0425a48e6 1a3324868a
commit 825106d074
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
setup/so-functions
View File

@@ -1189,10 +1189,11 @@ docker_install() {
{
yum clean expire-cache;
if [[ ! $is_iso ]]; then
yum -y install docker-ce-20.10.5-3.el7 containerd.io-1.4.4-3.1.el7;
yum -y install docker-ce-20.10.5-3.el7 docker-ce-cli-20.10.5-3.el7 docker-ce-rootless-extras-20.10.5-3.el7 containerd.io-1.4.4-3.1.el7
fi
yum versionlock docker-ce-20.10.5-3.el7;
yum versionlock docker-ce-cli-20.10.5-3.el7;
yum versionlock docker-ce-20.10.5-3.el7
yum versionlock docker-ce-cli-20.10.5-3.el7
yum versionlock docker-ce-rootless-extras-20.10.5-3.el7
yum versionlock containerd.io-1.4.4-3.1.el7
} >> "$setup_log" 2>&1
@@ -1208,9 +1209,9 @@ docker_install() {
;;
esac
if [ $OSVER == "bionic" ]; then
retry 50 10 "apt-get -y install docker-ce=5:20.10.5~3-0~ubuntu-bionic python3-docker" >> "$setup_log" 2>&1 || exit 1
retry 50 10 "apt-get -y install docker-ce=5:20.10.5~3-0~ubuntu-bionic docker-ce-cli=5:20.10.5~3-0~ubuntu-bionic docker-ce-rootless-extras=5:20.10.5~3-0~ubuntu-bionic python3-docker" >> "$setup_log" 2>&1 || exit 1
elif [ $OSVER == "focal" ]; then
retry 50 10 "apt-get -y install docker-ce=5:20.10.8~3-0~ubuntu-focal python3-docker" >> "$setup_log" 2>&1 || exit 1
retry 50 10 "apt-get -y install docker-ce=5:20.10.8~3-0~ubuntu-focal docker-ce-cli=5:20.10.8~3-0~ubuntu-focal docker-ce-rootless-extras=5:20.10.8~3-0~ubuntu-focal python3-docker" >> "$setup_log" 2>&1 || exit 1
fi
fi
docker_registry
@@ -2816,7 +2817,7 @@ update_sudoers() {
update_packages() {
if [ "$OS" = 'centos' ]; then
yum repolist >> /dev/null
yum -y update --exclude=salt*,wazuh* >> "$setup_log"
yum -y update --exclude=salt*,wazuh*,docker*,containerd* >> "$setup_log"
else
retry 50 10 "apt-get -y update" >> "$setup_log" 2>&1 || exit 1
retry 50 10 "apt-get -y upgrade" >> "$setup_log" 2>&1 || exit 1