script: ensure curl is always available in build containers

Ensure that curl is installed in all build containers regardless of
ceph's dependencies or other factors. This allows us to use curl in
any subsequent build steps/scripts.

Fixes: https://tracker.ceph.com/issues/70451
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit b4e11f75bfa76036b9109485aa1cb4f9d633c8a2)

diff --git a/src/script/buildcontainer-setup.sh b/src/script/buildcontainer-setup.sh
index 1920883e5522b53aeb0dcc45f325707b05296e05..bfd61346c0594a2ca3ae43e4fc25bd1499b1c5e2 100644 (file)
--- a/src/script/buildcontainer-setup.sh
+++ b/src/script/buildcontainer-setup.sh
@@ -28,18 +28,18 @@ fi
 # packages etc.
 case "${CEPH_BASE_BRANCH}~${DISTRO_KIND}" in
     *~*centos*8)
-        dnf install -y java-1.8.0-openjdk-headless /usr/bin/rpmbuild wget
+        dnf install -y java-1.8.0-openjdk-headless /usr/bin/rpmbuild wget curl
         install_container_deps
         dnf_clean
     ;;
     *~*centos*9|*~*centos*10*|*~fedora*)
-        dnf install -y /usr/bin/rpmbuild wget
+        dnf install -y /usr/bin/rpmbuild wget curl
         install_container_deps
         dnf_clean
     ;;
     *~*ubuntu*)
         apt-get update
-        apt-get install -y wget reprepro
+        apt-get install -y wget reprepro curl
         install_container_deps
     ;;
     *)