File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -153,7 +153,6 @@ install_redhat_packages() {
153153 lsof \
154154 net-tools \
155155 psmisc \
156- curl \
157156 wget \
158157 ca-certificates \
159158 rsync \
@@ -174,6 +173,12 @@ install_redhat_packages() {
174173 man-db \
175174 strace"
176175
176+ # rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
177+ # Install 'curl' for every OS except this rockylinux:9
178+ if [[ " ${ID} " = " rocky" ]] && [[ " ${VERSION} " != * " 9." * ]]; then
179+ package_list=" ${package_list} curl"
180+ fi
181+
177182 # Install OpenSSL 1.0 compat if needed
178183 if ${install_cmd} -q list compat-openssl10 > /dev/null 2>&1 ; then
179184 package_list=" ${package_list} compat-openssl10"
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ source dev-container-features-test-lib
99. /etc/os-release
1010check " non-root user" test " $( whoami) " = " devcontainer"
1111check " distro" test " ${PLATFORM_ID} " = " platform:el8"
12+ check " curl" curl --version
1213
1314# Report result
1415reportResults
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ source dev-container-features-test-lib
99. /etc/os-release
1010check " non-root user" test " $( whoami) " = " devcontainer"
1111check " distro" test " ${PLATFORM_ID} " = " platform:el9"
12+ check " curl" curl --version
1213
1314# Report result
1415reportResults
You can’t perform that action at this time.
0 commit comments