From 7ef8fc80a01d65035ceaadc6af6f7f30b8b149fa Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@ibm.com>
Date: Tue, 10 Dec 2024 12:22:51 +0100
Subject: [PATCH] build: include `--nobest` while upgrading the devel container
 packages

On occasion there are inconsistencies in the CentOS or Ceph RPM
repositories. This can cause `dnf update` to fail when there are
conflicting versions of a package. By adding the `--nobest` option,
packages can get upgraded to an older version, but not the latest.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
(cherry picked from commit d8a040719e0ad491ad144fe361b67e6bd2109710)
---
 scripts/Dockerfile.devel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Dockerfile.devel b/scripts/Dockerfile.devel
index efd552488de..ec6c53d299d 100644
--- a/scripts/Dockerfile.devel
+++ b/scripts/Dockerfile.devel
@@ -35,7 +35,7 @@ RUN dnf -y install \
 	librados-devel \
         libcephfs-devel \
 	librbd-devel \
-    && dnf -y update \
+    && dnf -y --nobest update \
     && dnf clean all \
     && rm -rf /var/cache/yum \
     && true