From b930efddaa92acbc9c264a852bf934c0b4156cf1 Mon Sep 17 00:00:00 2001
From: maar_mi <mikkel.maarssoe@dlr.de>
Date: Fri, 27 Sep 2024 10:02:39 +0200
Subject: [PATCH] modified the container name for the adore_cli in the docker
 compose file

---
 adore_cli.mk   | 3 ++-
 adore_cli.yaml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/adore_cli.mk b/adore_cli.mk
index 62dd9ce..fccdab4 100644
--- a/adore_cli.mk
+++ b/adore_cli.mk
@@ -35,6 +35,7 @@ DOCKER_COMPOSE_FILE?=${ADORE_CLI_MAKEFILE_PATH}/docker-compose.yaml
 
 UID := $(shell id -u)
 GID := $(shell id -g)
+ADORE_TAG ?= $(ADORE_CLI_TAG)
 
 
 TEST_SCENARIOS?=adore_scenarios/baseline_test.launch
@@ -135,7 +136,7 @@ adore_cli_start_headless: adore_cli_setup
 .PHONY: adore_cli_attach
 adore_cli_attach:
 	@echo "Running adore_cli attach..."
-	docker exec -it ${ADORE_CLI_PROJECT}_${ADORE_CLI_TAG} /bin/zsh -c "ADORE_CLI_WORKING_DIRECTORY=${ADORE_CLI_WORKING_DIRECTORY} bash /tmp/adore_cli/tools/adore_cli.sh" || true
+	docker exec -it ${ADORE_CLI_PROJECT}_${ADORE_TAG} /bin/zsh -c "ADORE_CLI_WORKING_DIRECTORY=${ADORE_CLI_WORKING_DIRECTORY} bash /tmp/adore_cli/tools/adore_cli.sh" || true
 
 .PHONY: branch_adore_cli
 branch_adore_cli: ## Returns the current docker safe/sanitized branch for adore_cli 
diff --git a/adore_cli.yaml b/adore_cli.yaml
index 6a46eb6..a903d85 100644
--- a/adore_cli.yaml
+++ b/adore_cli.yaml
@@ -2,7 +2,7 @@ services:
   adore_cli_core:
     privileged: true
     image: ${ADORE_CLI_PROJECT}:${ADORE_CLI_TAG:-latest}
-    container_name: ${ADORE_CLI_PROJECT}_base_${ADORE_CLI_TAG}
+    container_name: ${ADORE_CLI_PROJECT}_base_${ADORE_TAG}
     user: ${USER}
     hostname: ${HOSTNAME:-ADORe-CLI}
     network_mode: "host"
@@ -39,7 +39,7 @@ services:
     ipc: "host"
     pid: "host"
     image: ${ADORE_CLI_PROJECT_X11_DISPLAY}:${ADORE_CLI_TAG:-latest}
-    container_name: ${ADORE_CLI_PROJECT}_${ADORE_CLI_TAG}
+    container_name: ${ADORE_CLI_PROJECT}_${ADORE_TAG}
     user: ${USER} 
     hostname: ${HOSTNAME:-ADORe-CLI}
     network_mode: "host"