From 0af2e452ef6b18801cd907f5dce4007cb7084445 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Thu, 7 Nov 2024 01:27:45 +0100
Subject: [PATCH] build(Makefile): make container name suffix identical to
 container file; remove some debug echoes

---
 Makefile | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 7b669c535..223c450c0 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ export MAILDEV_IMAGE = $(IMAGE_REGISTRY)/maildev/maildev:latest # TODO: needs di
 export IN_CONTAINER ?= false
 export IN_CI ?= false
 export CONTAINER_FILE
+export CONTAINER_IDENT
 export CF_PREFIX
 export DEVELOP
 export MOUNT_DIR=/mnt/fradrive
@@ -25,7 +26,6 @@ export SERVICE
 export SERVICE_VARIANT ?= $(SERVICE)
 export SERVICE_PARALLEL ?= false
 export JOB
-export JOB_ID
 export CONTAINER_CMD
 export ENTRYPOINT
 export EXEC_OPTS
@@ -176,23 +176,19 @@ lint-%: --act ;
 	DEVELOP=develop/`cat develop/.current` ; \
 	echo "$(SERVICE_PARALLEL)" ; \
 	if [[ "$(SERVICE_PARALLEL)" == "false" ]] ; then \
-	  CONTAINER_FILE=$${DEVELOP}/$(CF_PREFIX)$(SERVICE_VARIANT) ; \
-	  JOB_ID=$(JOB) ; \
-	  if [[ -e $${CONTAINER_FILE} ]]; then \
+	  CONTAINER_IDENT=$(CF_PREFIX)$(SERVICE_VARIANT) ; \
+	  if [[ -e $${DEVELOP}/$${CONTAINER_IDENT} ]]; then \
 	    >&2 echo "Another $* service is already running! Use \"make new-develop\" to start a new develop instance despite currently running services." ; \
 	    exit 1 ; \
 	  fi ; \
 	else \
-	  DEVDIR=$${DEVELOP}/$(CF_PREFIX)$(SERVICE_VARIANT) ; \
 	  I=`ls $${DEVELOP} | grep '$(SERVICE_VARIANT)' | sed 's/$(SERVICE_VARIANT)-//' | sort -n | tail -n1` ; \
-	  echo "I=$${I}" ; \
 	  J=$$(($${I}+1)) ; \
-	  echo "J=$${J}" ; \
-	  CONTAINER_FILE=$${DEVDIR}-$${J} ; \
-	  JOB_ID=$(JOB)-$${J} ; \
+	  CONTAINER_IDENT=$(CF_PREFIX)$(SERVICE_VARIANT)-$${J} ; \
 	fi ; \
+	CONTAINER_FILE=$${DEVELOP}/$${CONTAINER_IDENT} ; \
 	echo "$(PORTS)" | sed 's/ /\n/g' > $${CONTAINER_FILE} ; \
-	$(MAKE) -- --$* CONTAINER_FILE=$${CONTAINER_FILE} JOB_ID=$${JOB_ID}
+	$(MAKE) -- --$* CONTAINER_FILE=$${CONTAINER_FILE} CONTAINER_IDENT=$${CONTAINER_IDENT}
 
 .PHONY: image-rebuild_%
 # HELP(image-rebuild_{backend,frontend,database,memcached,minio}): force-rebuild the stated docker image
@@ -215,10 +211,9 @@ else
 endif
 
 --containerized: --image-build
-	echo "--containerized ################## ATTACHED: $(CONTAINER_ATTACHED)"
 	DEVELOP=`cat develop/.current` ; \
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
-	CONTAINER_NAME=fradrive.$(CURR_DEV).$(SERVICE_VARIANT).$(JOB_ID) ; \
+	CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \
 	CONTAINER_ID=`$(CONTAINER_BGRUN) \
 	  -v $(PWD):$(MOUNT_DIR) \
 	  --env IN_CONTAINER=true \
@@ -230,7 +225,6 @@ endif
 	` ; \
 	printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
 	if [[ "true" == "$(CONTAINER_ATTACHED)" ]] ; then \
-	  echo "###!!! postgres shall not go here!" ; \
 	  $(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \
 	fi