From 90a9821ba8fff2e216195b24301c9e5b37908031 Mon Sep 17 00:00:00 2001 From: Gil Bregman Date: Mon, 23 Oct 2023 13:39:49 +0300 Subject: [PATCH] Add a container name for the gateway so we could use it in demo.mk. Fixes #265 Signed-off-by: Gil Bregman --- .env | 2 ++ .github/workflows/build-container.yml | 2 +- mk/demo.mk | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 69e77f97..8b5f043a 100644 --- a/.env +++ b/.env @@ -8,6 +8,8 @@ QUAY_CEPH="${CONTAINER_REGISTRY}/vstart-cluster" QUAY_NVMEOF="${CONTAINER_REGISTRY}/nvmeof" QUAY_NVMEOFCLI="${CONTAINER_REGISTRY}/nvmeof-cli" MAINTAINER="Ceph Developers " +COMPOSE_PROJECT_NAME="ceph-nvmeof" +NVMEOF_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}-nvmeof-1" # Performance NVMEOF_NOFILE=20480 # Max number of open files (depends on number of hosts connected) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index bd7a53e0..9bebaaf9 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -218,7 +218,7 @@ jobs: - name: Test run: | - make demo OPTS=-T + make demo OPTS=-T NVMEOF_CONTAINER_NAME="ceph-nvmeof_nvmeof_1" - name: Get subsystems run: | diff --git a/mk/demo.mk b/mk/demo.mk index 4f2f9c80..f8bcbd63 100644 --- a/mk/demo.mk +++ b/mk/demo.mk @@ -7,7 +7,7 @@ rbd: CMD = bash -c "rbd -p $(RBD_POOL) info $(RBD_IMAGE_NAME) || rbd -p $(RBD_PO # demo # the fist gateway in docker enviroment, hostname defaults to container id -demo: export NVMEOF_HOSTNAME != docker ps -q -f name=ceph-nvmeof_nvmeof_1 +demo: export NVMEOF_HOSTNAME != docker ps -q -f name=$(NVMEOF_CONTAINER_NAME) demo: rbd ## Expose RBD_IMAGE_NAME as NVMe-oF target $(NVMEOF_CLI) create_bdev --pool $(RBD_POOL) --image $(RBD_IMAGE_NAME) --bdev $(BDEV_NAME) $(NVMEOF_CLI) create_subsystem --subnqn $(NQN)