Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions shell-lib/acmlib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,8 @@ ensure_common_tools_installed () {
$SUDO yum -y -q -e 0 install yum-utils
fi

#Addresses AC-Hunter issue #2185
if [ -x /usr/bin/subscription-manager ]; then #Only attempt this on RHEL, not Centos or other clones
#Note, when extending to other RHEL releases (>7.x) we'll need to test for the release version and adjust the repository name.
#Enable extra repository for RHEL 7.x (addresses AC-Hunter issue #2185)
if [ -x /usr/bin/subscription-manager -a -s /etc/redhat-release ] && grep -iq 'release 7' /etc/redhat-release ; then
$SUDO subscription-manager repos --enable=rhel-7-server-extras-rpms
fi

Expand Down
5 changes: 4 additions & 1 deletion shell-lib/docker/install_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ elif [ -s /etc/redhat-release ] && grep -iq 'release 7\|release 8\|release 9' /e

$SUDO yum -y -q -e 0 install yum-utils device-mapper-persistent-data lvm2 shadow-utils

$SUDO yum-config-manager -q --enable extras >/dev/null
# Enable "extras" repo if not RHEL or CentOS Stream
if ! grep -iq 'red hat enterprise linux\|centos stream' /etc/redhat-release; then
$SUDO yum-config-manager -q --enable extras >/dev/null
fi

if [ ! -f /etc/yum.repos.d/docker-ce.repo ]; then
$SUDO yum-config-manager -q --add-repo https://download.docker.com/linux/centos/docker-ce.repo > /dev/null
Expand Down