Merge pull request #286 from gbregman/devel

Update Ceph toversion 18.2.0.

.env

@@ -1,6 +1,6 @@
 # Globals
 VERSION="0.0.5"
-CEPH_VERSION="17.2.6"
+CEPH_VERSION="18.2.0"
 SPDK_VERSION="23.01.1"
 CONTAINER_REGISTRY="quay.io/ceph"
 QUAY_SPDK="${CONTAINER_REGISTRY}/spdk"

Dockerfile.ceph

@@ -38,9 +38,6 @@ RUN rpm -vih https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.
 RUN rpm --import 'https://download.ceph.com/keys/release.asc'
 RUN cd /etc/yum.repos.d/ && curl -O https://copr.fedorainfracloud.org/coprs/ceph/el9/repo/epel-9/ceph-el9-epel-9.repo
 
-## WORKAROUND: remove when https://tracker.ceph.com/issues/61882 is fixed
-RUN rpm -vih "https://buildlogs.centos.org/centos/9-stream/storage/x86_64/ceph-quincy/Packages/t/thrift-0.14.0-7.el9s.x86_64.rpm"
-
 RUN \
     --mount=type=cache,target=/var/cache/microdnf \
     microdnf install -y \

Dockerfile.spdk

@@ -38,6 +38,7 @@ RUN \
     && dnf install -y \
         rpm-build \
         git-core \
+    && rpm -vih https://buildlogs.centos.org/centos/9-stream/storage/x86_64/ceph-reef/Packages/t/thrift-0.15.0-3.el9s.x86_64.rpm \
     && scripts/pkgdep.sh $SPDK_PKGDEP_ARGS \
     && dnf update -y
 
@@ -120,6 +121,7 @@ RUN \
     --mount=type=cache,target=/var/lib/dnf \
     rpm -vih $SPDK_CENTOS_BASE/centos-stream-repos-$SPDK_CENTOS_REPO_VER.noarch.rpm \
              $SPDK_CENTOS_BASE/centos-gpg-keys-$SPDK_CENTOS_REPO_VER.noarch.rpm \
+             https://buildlogs.centos.org/centos/9-stream/storage/x86_64/ceph-reef/Packages/t/thrift-0.15.0-3.el9s.x86_64.rpm \
     && dnf install -y /rpm/$(uname -m)/*.rpm \
     && dnf update -y