diff --git a/bin/dump_ConfigDb.sh b/bin/dump_ConfigDb.sh index c2273438abfe09873c8f89cd9f61ecf65e1efdc2..af76d68da825fbe583156f472cc796f7786b4d5c 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 69b28589673af23659e5e069bf979ce4fb5d57d3..20f2c2923da0cb12a6feaca853104418b4ff7026 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 cbd4679e3a7b1d17a9a84b60e117381378d34ed7..8a8d5e38080bb71d884b43645ce5c892fce0a07e 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 a36bfb99d6b97b2944d78f6b44249a950dcd4a61..707eee508b7dd0019775037e95b6a31e0a41d00b 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 f3216f53a26297cbddd13ef1a821dc14f77e96c6..a8fab09f7846a5dc354f35e5cd58f4483833c970 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