docker: log variables

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>

Author: epuertat

.env

@@ -50,14 +50,14 @@ SPDK_URL="https://spdk.io"
 SPDK_PKGDEP_ARGS="--rbd"
 # check spdk/configure --help
 SPDK_CONFIGURE_ARGS="--with-rbd --disable-tests --disable-unit-tests --disable-examples --enable-debug"
-#SPDK_TARGET_ARCH="x86-64-v2"
+SPDK_TARGET_ARCH="x86-64-v2"
 SPDK_MAKEFLAGS=
 SPDK_CENTOS_BASE="https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/Packages/"
 SPDK_CENTOS_REPO_VER="9.0-21.el9"
 
 # Ceph Cluster
 CEPH_CLUSTER_VERSION="${CEPH_VERSION}"
-# CEPH_CLUSTER_CEPH_REPO_BASEURL= # Uncomment for specifying a custom Ceph YUM repo
+CEPH_CLUSTER_CEPH_REPO_BASEURL="https://download.ceph.com/rpm-${CEPH_CLUSTER_VERSION}/el\$releasever"
 CEPH_VSTART_ARGS="--memstore"
 CEPH_DEVEL_MGR_PATH=../ceph
 

.github/workflows/build-container.yml

@@ -23,7 +23,7 @@ jobs:
           submodules: recursive
 
       - name: Build container images
-        run: make build SPDK_TARGET_ARCH=x86-64-v2
+        run: make build SPDK_TARGET_ARCH=x86-64
 
       - name: Save container images
         run: |

Dockerfile.ceph

@@ -6,22 +6,6 @@ ARG CEPH_CLUSTER_VERSION \
     CEPH_CLUSTER_CEPH_REPO_BASEURL \
     CEPH_CLUSTER_EPEL_REPO_URL="https://copr.fedorainfracloud.org/coprs/ceph/el9/repo/epel-9/ceph-el9-epel-9.repo"
 
-COPY <<EOF /etc/yum.repos.d/ceph.repo
-[Ceph]
-name=Ceph packages for \$basearch
-baseurl=${CEPH_CLUSTER_CEPH_REPO_BASEURL:-https://download.ceph.com/rpm-$CEPH_CLUSTER_VERSION/el\$releasever}/\$basearch
-enabled=1
-priority=2
-gpgcheck=0
-
-[Ceph-noarch]
-name=Ceph noarch packages
-baseurl=${CEPH_CLUSTER_CEPH_REPO_BASEURL:-https://download.ceph.com/rpm-$CEPH_CLUSTER_VERSION/el\$releasever}/noarch
-enabled=1
-priority=2
-gpgcheck=0
-EOF
-
 ARG MICRODNF_OPTS="\
     --enablerepo crb \
     --nobest \
@@ -58,9 +42,33 @@ ARG DEBUG_PACKAGES="\
     lsof \
     "
 
+RUN <<EOF
+    echo Log variables
+    echo ======================================================================
+    echo CEPH_CLUSTER_CEPH_REPO_BASEURL=$CEPH_CLUSTER_CEPH_REPO_BASEURL
+    echo CEPH_CLUSTER_VERSION=$CEPH_CLUSTER_VERSION
+    echo ======================================================================
+EOF
+
+COPY <<EOF /etc/yum.repos.d/ceph.repo
+[Ceph]
+name=Ceph packages for \$basearch
+baseurl=${CEPH_CLUSTER_CEPH_REPO_BASEURL:?}/\$basearch
+enabled=1
+priority=2
+gpgcheck=0
+
+[Ceph-noarch]
+name=Ceph noarch packages
+baseurl=${CEPH_CLUSTER_CEPH_REPO_BASEURL:?}/noarch
+enabled=1
+priority=2
+gpgcheck=0
+EOF
+
 RUN rpm -vih https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
 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 curl -O --output-dir /etc/yum.repos.d/ ${CEPH_CLUSTER_EPEL_REPO_URL:?}
 
 RUN --mount=type=cache,target=/var/cache/microdnf \
     microdnf install -y $MICRODNF_OPTS \
@@ -106,7 +114,8 @@ 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 .
+ADD --chown=ceph:ceph --chmod=755 \
+    https://raw.githubusercontent.com/ceph/ceph/v${CEPH_CLUSTER_VERSION:?}/src/vstart.sh .
 
 COPY <<EOF ./CMakeCache.txt
 ceph_SOURCE_DIR:STATIC=/ceph

Dockerfile.spdk

@@ -14,7 +14,24 @@ FROM quay.io/centos/centos:stream9 AS build
 
 ARG SPDK_CEPH_VERSION \
     SPDK_VERSION \
-    DNF_OPTS
+    DNF_OPTS \
+    SPDK_PKGDEP_ARGS \
+    SPDK_CONFIGURE_ARGS \
+    SPDK_TARGET_ARCH \
+    SPDK_MAKEFLAGS
+
+RUN <<EOF
+    echo Log variables
+    echo ======================================================================
+    echo SPDK_PKGDEP_ARGS=$SPDK_PKGDEP_ARGS
+    echo SPDK_CONFIGURE_ARGS=$SPDK_CONFIGURE_ARGS
+    echo SPDK_TARGET_ARCH=$SPDK_TARGET_ARCH
+    echo SPDK_MAKEFLAGS=$SPDK_MAKEFLAGS
+    echo ======================================================================
+EOF
+
+WORKDIR /src
+COPY . .
 
 COPY <<EOF /etc/yum.conf
 [main]
@@ -47,14 +64,6 @@ gpgcheck=1
 gpgkey=https://download.ceph.com/keys/release.asc
 EOF
 
-ARG SPDK_PKGDEP_ARGS \
-    SPDK_CONFIGURE_ARGS \
-    SPDK_TARGET_ARCH \
-    SPDK_MAKEFLAGS
-
-WORKDIR /src
-COPY . .
-
 RUN \
     --mount=type=cache,target=/var/cache/dnf \
     --mount=type=cache,target=/var/lib/dnf \