From 88e984d4e53485f04bafafdf8a843a41ab73f101 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Thu, 7 Nov 2024 02:25:58 +0100
Subject: [PATCH] build(Makefile): use SET_CONTAINER_CMD to splice
 CONTAINER_CMD inside podman run

---
 Makefile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 718063eef..4e4f0361b 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ export SERVICE_VARIANT ?= $(SERVICE)
 export SERVICE_PARALLEL ?= false
 export JOB
 export CONTAINER_CMD
+export SET_CONTAINER_CMD
 export ENTRYPOINT
 export EXEC_OPTS
 
@@ -129,13 +130,13 @@ start:
 .PHONY: %-memcached
 %-memcached: SERVICE=memcached
 %-memcached: SERVICE_VARIANT=memcached
-%-memcached: CONTAINER_CMD=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`
+%-memcached: SET_CONTAINER_CMD=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`
 %-memcached: BASE_PORTS = "MEMCACHED_PORT=11211"
 
 .PHONY: %-minio
 %-minio: SERVICE=minio
 %-minio: SERVICE_VARIANT=minio
-%-minio: CONTAINER_CMD=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`
+%-minio: SET_CONTAINER_CMD=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`
 %-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000"
 
 .PHONY: start-%
@@ -212,6 +213,12 @@ endif
 	DEVELOP=`cat develop/.current` ; \
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
 	CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \
+	if ! [ -z "$(SET_CONTAINER_CMD)" ] ; \
+	  then \
+	    CONTAINER_CMD="$(SET_CONTAINER_CMD)" ; \
+	  else \
+	    CONTAINER_CMD=$(CONTAINER_CMD) ; \
+	fi ; \
 	CONTAINER_ID=`$(CONTAINER_BGRUN) \
 	  -v $(PWD):$(MOUNT_DIR) \
 	  --env IN_CONTAINER=true \
@@ -219,7 +226,7 @@ endif
 	  --env CONTAINER_FILE=$(CONTAINER_FILE) \
 	  --env CONTAINER_NAME=$${CONTAINER_NAME} \
 	  --name $${CONTAINER_NAME} \
-	  $(CONTAINER_CMD) \
+	  $${CONTAINER_CMD} \
 	` ; \
 	printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
 	if [[ "true" == "$(CONTAINER_ATTACHED)" ]] ; then \