Revert "Use docker-ce for CentOS"

This reverts commit c3f0636.
GhostWriters · Oct 3, 2021 · a260337 · a260337
1 parent c3f0636
commit a260337
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/.scripts/pm_yum_install_docker.sh b/.scripts/pm_yum_install_docker.sh
@@ -3,23 +3,12 @@ set -Eeuo pipefail
 IFS=$'\n\t'
 
 pm_yum_install_docker() {
-    # https://docs.docker.com/install/linux/docker-ce/centos/
-    info "Removing conflicting Docker packages."
-    yum -y remove docker \
-        docker-client \
-        docker-client-latest \
-        docker-common \
-        docker-compose \
-        docker-engine \
-        docker-latest \
-        docker-latest-logrotate \
-        docker-logrotate > /dev/null 2>&1 || true
     notice "Installing docker. Please be patient, this can take a while."
     local REDIRECT="> /dev/null 2>&1"
     if [[ -n ${VERBOSE:-} ]] || run_script 'question_prompt' "${PROMPT:-CLI}" N "Would you like to display the command output?"; then
         REDIRECT=""
     fi
-    eval yum -y install containerd.io docker-ce docker-ce-cli "${REDIRECT}" || fatal "Failed to install docker from yum.\nFailing command: ${F[C]}yum -y install containerd.io docker-ce docker-ce-cli"
+    eval yum -y install docker "${REDIRECT}" || fatal "Failed to install docker from yum.\nFailing command: ${F[C]}yum -y install docker"
 }
 
 test_pm_yum_install_docker() {

diff --git a/.scripts/pm_yum_repos.sh b/.scripts/pm_yum_repos.sh
@@ -15,10 +15,6 @@ pm_yum_repos() {
     fi
     eval bash "${MKTEMP_GET_IUS}" "${REDIRECT}" || warn "Failed to install IUS."
     rm -f "${MKTEMP_GET_IUS}" || warn "Failed to remove temporary IUS repo install script."
-    info "Installing yum-utils"
-    yum -y install yum-utils || fatal "Failed to install yum-utils from yum.\nFailing command: ${F[C]}yum -y install yum-utils"
-    info "Setting up docker repository."
-    yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo || fatal "Failed to set up docker repository.\nFailing command: ${F[C]}yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo"
 }
 
 test_pm_yum_repos() {