From: John Mulligan <jmulligan@redhat.com>
Date: Thu, 13 Mar 2025 11:59:42 +0000 (-0400)
Subject: script: ensure curl is always available in build containers
X-Git-Tag: v20.3.0~368^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b4e11f75bfa76036b9109485aa1cb4f9d633c8a2;p=ceph.git

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>
---

diff --git a/src/script/buildcontainer-setup.sh b/src/script/buildcontainer-setup.sh
index 1920883e5522b..bfd61346c0594 100644
--- 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
     ;;
     *)