From 784383c1dd14dc691e0c6dd713046e8d77fe2339 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Sun, 3 Oct 2021 15:23:42 +0200
Subject: [PATCH] L2SS-394: Removed superfluous TANGO_CONTAINER_ENV
---
bootstrap/etc/lofar20rc.sh | 3 ---
sbin/load_ConfigDb.sh | 2 +-
sbin/update_ConfigDb.sh | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/bootstrap/etc/lofar20rc.sh b/bootstrap/etc/lofar20rc.sh
index e9e8ac326..202ccb761 100755
--- a/bootstrap/etc/lofar20rc.sh
+++ b/bootstrap/etc/lofar20rc.sh
@@ -35,9 +35,6 @@ export TANGO_HOST=$(hostname):10000
# NO MODIFICATION BEYOND THIS POINT!
#
-# Provide the -v parameters for Docker and the -e ENV variables.
-export TANGO_CONTAINER_ENV="-e TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR}"
-
# Remove all LOFAR1 related environment modifications
function remove_lofar()
{
diff --git a/sbin/load_ConfigDb.sh b/sbin/load_ConfigDb.sh
index 6b5fbb11d..96432f31c 100755
--- a/sbin/load_ConfigDb.sh
+++ b/sbin/load_ConfigDb.sh
@@ -29,4 +29,4 @@ if [ ${1:0:10} != /hosthome/ -a ${1:0:20} != /opt/lofar2.0/tango/ -a ${1:0:14} !
fi
fi
-docker exec -it ${TANGO_CONTAINER_ENV} dsconfig json2tango --write ${file}
+docker exec -it dsconfig json2tango --write ${file}
diff --git a/sbin/update_ConfigDb.sh b/sbin/update_ConfigDb.sh
index fc3dc051b..0f22b48cb 100755
--- a/sbin/update_ConfigDb.sh
+++ b/sbin/update_ConfigDb.sh
@@ -34,4 +34,4 @@ if [ ${1:0:10} != /hosthome/ -a ${1:0:20} != /opt/lofar2.0/tango/ -a ${1:0:14} !
fi
fi
-docker exec -it ${TANGO_CONTAINER_ENV} dsconfig json2tango --write --update ${file}
+docker exec -it dsconfig json2tango --write --update ${file}
--
GitLab