From fefc1b6726a6dd9dbc6dfc51fa7ec6cbba415360 Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Tue, 11 Jun 2024 09:18:45 +1200 Subject: [PATCH] fix(installer): remove centos 7 and 8 repo due to eol (#648) * fix(installer): remove centos 7 and 8 repo due to eol * remove unused code * remove yum-utils install --- .../templates/common/docker-install.sh | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/install_scripts/templates/common/docker-install.sh b/install_scripts/templates/common/docker-install.sh index ffc80e65..81508006 100644 --- a/install_scripts/templates/common/docker-install.sh +++ b/install_scripts/templates/common/docker-install.sh @@ -217,28 +217,6 @@ _installDocker() { fi fi - # docker-ce 20.10+ includes docker-ce-rootless-extras, which has some depenendencies not - # Found in any of the yum repos available on RHEL on Azure. - # Also seen on Oracle Enterprise Linux. - compareDockerVersions "20.10.0" "${1}" - if { [ "$LSB_DIST" = "rhel" ] || [ "$LSB_DIST" = "ol" ] ; } && [ "$COMPARE_DOCKER_VERSIONS_RESULT" -le "0" ]; then - if ! yum list installed "yum-utils" >/dev/null 2>&1; then - logStep "Installing yum-utils" - yum install -y yum-utils - logSuccess "Installed yum-utils" - fi - getUrlCmd - if [ "$DIST_VERSION_MAJOR" -eq 7 ]; then - yum-config-manager --add-repo=http://mirror.centos.org/centos/7/extras/x86_64 || true - $URLGET_CMD "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7" > EXTRAS_KEY - else - yum-config-manager --add-repo=http://mirror.centos.org/centos/8/extras/x86_64/os || true - $URLGET_CMD "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official" > EXTRAS_KEY - fi - rpm --import EXTRAS_KEY - rm EXTRAS_KEY - fi - _docker_install_url="{{ replicated_install_url }}/docker-install.sh" printf "${GREEN}Installing docker version ${1} from ${_docker_install_url}${NC}\n" getUrlCmd