From 318b9ed01497446878c73247ea31f9433f5afbfc Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Thu, 15 Dec 2022 16:49:09 +0100
Subject: [PATCH] L2SS-961: remove container prefix from scripts
---
bin/dump_ConfigDb.sh | 2 +-
bin/itango_console.sh | 2 +-
bin/itango_shell.sh | 2 +-
sbin/load_ConfigDb.sh | 4 ++--
sbin/update_ConfigDb.sh | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bin/dump_ConfigDb.sh b/bin/dump_ConfigDb.sh
index c2273438a..af76d68da 100755
--- a/bin/dump_ConfigDb.sh
+++ b/bin/dump_ConfigDb.sh
@@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
# writes the JSON dump to stdout, Do not change -i into -it incompatible with gitlab ci!
-docker exec -i "${CONTAINER_NAME_PREFIX}"dsconfig bash -c '
+docker exec -i dsconfig bash -c '
python -m dsconfig.dump > /tmp/dsconfig-configdb-dump.json
/manage_object_properties.py -r > /tmp/dsconfig-objectdb-dump.json
/merge_json.py /tmp/dsconfig-objectdb-dump.json /tmp/dsconfig-configdb-dump.json'
diff --git a/bin/itango_console.sh b/bin/itango_console.sh
index 69b285896..20f2c2923 100755
--- a/bin/itango_console.sh
+++ b/bin/itango_console.sh
@@ -2,4 +2,4 @@
# Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
# SPDX-License-Identifier: Apache-2.0
-exec docker exec -it "${CONTAINER_NAME_PREFIX}"itango itango3
+exec docker exec -it itango itango3
diff --git a/bin/itango_shell.sh b/bin/itango_shell.sh
index cbd4679e3..8a8d5e380 100755
--- a/bin/itango_shell.sh
+++ b/bin/itango_shell.sh
@@ -2,4 +2,4 @@
# Copyright (C) 2022 ASTRON (Netherlands Institute for Radio Astronomy)
# SPDX-License-Identifier: Apache-2.0
-exec docker exec -it "${CONTAINER_NAME_PREFIX}"itango /bin/bash
+exec docker exec -it itango /bin/bash
diff --git a/sbin/load_ConfigDb.sh b/sbin/load_ConfigDb.sh
index a36bfb99d..707eee508 100755
--- a/sbin/load_ConfigDb.sh
+++ b/sbin/load_ConfigDb.sh
@@ -11,10 +11,10 @@ fi
# copy file into container to read it from container, as the file's location
# in the container won't be the same as on the host.
-docker cp "${file}" "${CONTAINER_NAME_PREFIX}"dsconfig:/tmp/dsconfig-update-settings.json || exit 1
+docker cp "${file}" dsconfig:/tmp/dsconfig-update-settings.json || exit 1
# update settings, Do not change -i into -it this will break integration tests in gitlab ci!
-docker exec -i "${CONTAINER_NAME_PREFIX}"dsconfig json2tango --write /tmp/dsconfig-update-settings.json
+docker exec -i dsconfig json2tango --write /tmp/dsconfig-update-settings.json
# somehow json2tango does not return 0 on success
exit 0
diff --git a/sbin/update_ConfigDb.sh b/sbin/update_ConfigDb.sh
index f3216f53a..a8fab09f7 100755
--- a/sbin/update_ConfigDb.sh
+++ b/sbin/update_ConfigDb.sh
@@ -11,13 +11,13 @@ fi
# copy file into container to read it from container, as the file's location
# in the container won't be the same as on the host.
-docker cp "${file}" "${CONTAINER_NAME_PREFIX}"dsconfig:/tmp/dsconfig-update-settings.json || exit 1
+docker cp "${file}" dsconfig:/tmp/dsconfig-update-settings.json || exit 1
# update settings, Do not change -i into -it this will break integration tests in gitlab ci!
-docker exec -i "${CONTAINER_NAME_PREFIX}"dsconfig /manage_object_properties.py --write < "${file}"
+docker exec -i dsconfig /manage_object_properties.py --write < "${file}"
# update settings, Do not change -i into -it this will break integration tests in gitlab ci!
-docker exec -i "${CONTAINER_NAME_PREFIX}"dsconfig json2tango --write --update /tmp/dsconfig-update-settings.json
+docker exec -i dsconfig json2tango --write --update /tmp/dsconfig-update-settings.json
# somehow json2tango does not return 0 on success
exit 0
--
GitLab