From 742bba99bbe235ea51f16a3fffd5a3e38d0c17a3 Mon Sep 17 00:00:00 2001
From: Ernesto Puerta <epuertat@redhat.com>
Date: Wed, 20 Mar 2024 10:42:23 +0100
Subject: [PATCH] ceph: improve building of dev images

- Set `NVMEOF_GW` for `vstart` to work with nvmeof.
- Help debug ceph.repo issues.
- Add new `CEPH_CLUSTER_CEPH_REPO_BASEURL` alternative to setting
  `CEPH_BRANCH` and `CEPH_SHA`.
- Fix setting `CEPH_CLUSTER_CEPH_REPO_BASEURL` in `Makefile` not to
  override value if externally set (via .env).

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
---
 .env                |  4 +++-
 Dockerfile.ceph     | 20 ++++++++++++++------
 Dockerfile.spdk     |  3 ++-
 Makefile            |  2 +-
 docker-compose.yaml |  7 ++++---
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index d2107f40..b91ca450 100644
--- a/.env
+++ b/.env
@@ -58,10 +58,12 @@ SPDK_CENTOS_REPO_VER="9.0-21.el9"
 
 # Ceph Cluster
 CEPH_CLUSTER_VERSION="${CEPH_VERSION}"
+#CEPH_CLUSTER_VSTART_VERSION="v${CEPH_VERSION}"
+CEPH_CLUSTER_VSTART_VERSION="main"
 CEPH_BRANCH=ceph-nvmeof-mon
 CEPH_SHA=a4f2962ef7ad30b6e015c14e2c398015a766695a
-CEPH_VSTART_ARGS="--memstore"
 CEPH_DEVEL_MGR_PATH=../ceph
+#CEPH_CLUSTER_CEPH_REPO_BASEURL=https://1.chacra.ceph.com/r/ceph/main/71e6beb6de9ad34b7d44be0ccdf38721ae92202d/centos/9/flavors/default
 
 # Demo settings
 RBD_POOL=rbd
diff --git a/Dockerfile.ceph b/Dockerfile.ceph
index 3b0f62bb..4b521eb0 100644
--- a/Dockerfile.ceph
+++ b/Dockerfile.ceph
@@ -4,7 +4,10 @@ FROM quay.io/centos/centos:stream9-minimal AS build
 
 
 ARG CEPH_CLUSTER_VERSION
+ARG CEPH_CLUSTER_VSTART_VERSION
 ARG CEPH_CLUSTER_CEPH_REPO_BASEURL
+ARG CEPH_BRANCH
+ARG CEPH_SHA
 ARG CEPH_CLUSTER_EPEL_REPO_URL="https://copr.fedorainfracloud.org/coprs/ceph/el9/repo/epel-9/ceph-el9-epel-9.repo"
 
 ARG MICRODNF_OPTS="\
@@ -48,6 +51,9 @@ RUN <<EOF
     echo ======================================================================
     echo CEPH_CLUSTER_CEPH_REPO_BASEURL=$CEPH_CLUSTER_CEPH_REPO_BASEURL
     echo CEPH_CLUSTER_VERSION=$CEPH_CLUSTER_VERSION
+    echo CEPH_CLUSTER_VSTART_VERSION=$CEPH_CLUSTER_VSTART_VERSION
+    echo CEPH_BRANCH=$CEPH_BRANCH
+    echo CEPH_SHA=$CEPH_SHA
     echo ======================================================================
 EOF
 
@@ -73,6 +79,8 @@ 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 curl -O --output-dir /etc/yum.repos.d/ ${CEPH_CLUSTER_EPEL_REPO_URL:?}
 
+RUN cat /etc/yum.repos.d/ceph.repo
+
 RUN --mount=type=cache,target=/var/cache/microdnf \
     microdnf install -y $MICRODNF_OPTS \
       $CEPH_PACKAGES \
@@ -83,12 +91,12 @@ RUN --mount=type=cache,target=/var/cache/microdnf \
 #------------------------------------------------------------------------------
 FROM build
 
-LABEL maintainer \
+LABEL maintainer="$MAINTAINER" \
       ceph=True \
-      RELEASE \
-      GIT_REPO \
-      GIT_BRANCH \
-      GIT_COMMIT
+      RELEASE="$RELEASE" \
+      GIT_REPO="$GIT_REPO" \
+      GIT_BRANCH="$GIT_BRANCH" \
+      GIT_COMMIT="$GIT_COMMIT"
 
 ENV MON=1 \
     MGR=1 \
@@ -118,7 +126,7 @@ RUN ln -sf $EC_PATH/* $CEPH_LIB && \
 USER ceph
 WORKDIR /ceph
 ADD --chown=ceph:ceph --chmod=755 \
-    https://raw.githubusercontent.com/ceph/ceph/v${CEPH_CLUSTER_VERSION:?}/src/vstart.sh .
+    https://raw.githubusercontent.com/ceph/ceph/${CEPH_CLUSTER_VSTART_VERSION:?}/src/vstart.sh .
 
 COPY <<EOF ./CMakeCache.txt
 ceph_SOURCE_DIR:STATIC=/ceph
diff --git a/Dockerfile.spdk b/Dockerfile.spdk
index 2cba8821..bead925b 100644
--- a/Dockerfile.spdk
+++ b/Dockerfile.spdk
@@ -106,7 +106,8 @@ ARG SPDK_CENTOS_REPO_VER="9.0-21.el9"
 
 ARG SPDK_PKGDEP_ARGS \
     SPDK_CONFIGURE_ARGS \
-    SPDK_MAKEFLAGS
+    SPDK_MAKEFLAGS \
+    SPDK_TARGET_ARCH
 
 ARG SPDK_NAME \
     SPDK_SUMMARY \
diff --git a/Makefile b/Makefile
index af47d5e7..2db3b21e 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ build: export SPDK_GIT_BRANCH != git -C spdk name-rev --name-only HEAD
 build: export SPDK_GIT_COMMIT != git rev-parse HEAD:spdk
 build: export BUILD_DATE != date -u +"%Y-%m-%d %H:%M:%S %Z"
 build: export NVMEOF_GIT_MODIFIED_FILES != git status -s | grep -e "^ *M" | sed 's/^ *M //' | xargs
-build: export CEPH_CLUSTER_CEPH_REPO_BASEURL != curl -s https://shaman.ceph.com/api/repos/ceph/$(CEPH_BRANCH)/$(CEPH_SHA)/centos/9/ | jq -r '.[0].url'
+build: export CEPH_CLUSTER_CEPH_REPO_BASEURL ?= $(shell curl -s https://shaman.ceph.com/api/repos/ceph/$(CEPH_BRANCH)/$(CEPH_SHA)/centos/9/ | jq -r '.[0].url' )
 
 up: ## Launch services
 up: SCALE?= 1 ## Number of gateways
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a0e3029e..88229150 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -59,15 +59,16 @@ services:
       dockerfile: Dockerfile.ceph
       args:
         CEPH_CLUSTER_VERSION:
+        CEPH_CLUSTER_VSTART_VERSION:
         CEPH_CLUSTER_CEPH_REPO_BASEURL:
+        CEPH_BRANCH:
+        CEPH_SHA:
       labels:
         io.ceph.nvmeof:
     environment:
-      TOUCHFILE: /tmp/ceph.touch
+      NVMEOF_GW: ${NVMEOF_IP_ADDRESS}:${NVMEOF_GW_PORT}
     entrypoint: >-
       sh -c './vstart.sh --new $$CEPH_VSTART_ARGS &&
-      ceph osd pool create rbd &&
-      echo ceph dashboard nvmeof-gateway-add -i <(echo nvmeof-devel:5500) nvmeof.1 &&
       sleep infinity'
     healthcheck:
       test: ceph osd pool stats rbd