diff options
| -rw-r--r-- | src/common-utils/main.sh | 7 | ||||
| -rwxr-xr-x | test/common-utils/rocky-8.sh | 1 | ||||
| -rwxr-xr-x | test/common-utils/rocky-9.sh | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh index 6b1df8a..b6793d6 100644 --- a/src/common-utils/main.sh +++ b/src/common-utils/main.sh @@ -153,7 +153,6 @@ install_redhat_packages() { lsof \ net-tools \ psmisc \ - curl \ wget \ ca-certificates \ rsync \ @@ -174,6 +173,12 @@ install_redhat_packages() { man-db \ strace" + # rockylinux:9 installs 'curl-minimal' which clashes with 'curl' + # Install 'curl' for every OS except this rockylinux:9 + if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then + package_list="${package_list} curl" + fi + # Install OpenSSL 1.0 compat if needed if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then package_list="${package_list} compat-openssl10" diff --git a/test/common-utils/rocky-8.sh b/test/common-utils/rocky-8.sh index f6606db..be1223b 100755 --- a/test/common-utils/rocky-8.sh +++ b/test/common-utils/rocky-8.sh @@ -9,6 +9,7 @@ source dev-container-features-test-lib . /etc/os-release check "non-root user" test "$(whoami)" = "devcontainer" check "distro" test "${PLATFORM_ID}" = "platform:el8" +check "curl" curl --version # Report result reportResults
\ No newline at end of file diff --git a/test/common-utils/rocky-9.sh b/test/common-utils/rocky-9.sh index c4b5244..452c193 100755 --- a/test/common-utils/rocky-9.sh +++ b/test/common-utils/rocky-9.sh @@ -9,6 +9,7 @@ source dev-container-features-test-lib . /etc/os-release check "non-root user" test "$(whoami)" = "devcontainer" check "distro" test "${PLATFORM_ID}" = "platform:el9" +check "curl" curl --version # Report result reportResults
\ No newline at end of file |