Upgrade containerd.io and docker-ce to match ISO rpms

This commit is contained in:
Jason Ertel
2020-06-02 08:43:06 -04:00
parent 9d5f4049b5
commit 07c0075fc0
2 changed files with 4 additions and 4 deletions

View File

@@ -101,7 +101,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.9-3.el7 - docker-ce: 3:19.03.11-3.el7
- hold: True - hold: True
- update_holds: True - update_holds: True
{% endif %} {% endif %}

View File

@@ -613,9 +613,9 @@ docker_install() {
{ {
yum clean expire-cache; yum clean expire-cache;
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;
yum -y install docker-ce-19.03.9-3.el7 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.9-3.el7; yum versionlock docker-ce-19.03.11-3.el7;
yum versionlock containerd.io-1.2.6-3.el7 yum versionlock containerd.io-1.2.13-3.2.el7
} >> "$setup_log" 2>&1 } >> "$setup_log" 2>&1
else else