From cfb4079d89053a8c832f5636e8c4f85c1041cadd Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Thu, 13 Mar 2025 07:59:42 -0400 Subject: [PATCH] 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 (cherry picked from commit b4e11f75bfa76036b9109485aa1cb4f9d633c8a2) --- src/script/buildcontainer-setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/script/buildcontainer-setup.sh b/src/script/buildcontainer-setup.sh index 1920883e552..bfd61346c05 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 ;; *) -- 2.39.5