From 5bf386947463646c3ff772fe8eefffaaba38d3c4 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 6 Apr 2022 21:16:28 +0200
Subject: [PATCH] L2SS-742: Use FQDN for TANGO_HOST to avoid confusion in
hdbpp, which adds the FQDN TANGO_HOST to attribute names itself as well
---
docker-compose/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 1f859907b..d329b9bbb 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -114,7 +114,9 @@ ifeq ($(NETWORK_MODE),host)
MYSQL_HOST := $(shell hostname):3306
else
ifeq ($(TANGO_HOST),)
- TANGO_HOST := $(CONTAINER_NAME_PREFIX)databaseds:10000
+ # Use FQDN for TANGO_HOST to avoid confusion in the archiver, which also
+ # adds the domain.
+ TANGO_HOST := $(CONTAINER_NAME_PREFIX)databaseds.$(NETWORK_MODE):10000
else
TANGO_HOST := $(TANGO_HOST)
endif
--
GitLab