]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
script: ensure curl is always available in build containers 62274/head
authorJohn Mulligan <jmulligan@redhat.com>
Thu, 13 Mar 2025 11:59:42 +0000 (07:59 -0400)
committerJohn Mulligan <jmulligan@redhat.com>
Thu, 13 Mar 2025 12:05:16 +0000 (08:05 -0400)
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>
src/script/buildcontainer-setup.sh

index 1920883e5522b53aeb0dcc45f325707b05296e05..bfd61346c0594a2ca3ae43e4fc25bd1499b1c5e2 100644 (file)
@@ -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
     ;;
     *)