Skip to content
Snippets Groups Projects
Commit 318b9ed0 authored by Stefano Di Frischia's avatar Stefano Di Frischia
Browse files

L2SS-961: remove container prefix from scripts

parent 77feea92
Branches
Tags
1 merge request!511Resolve L2SS-961 "Single setup file"
......@@ -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'
......@@ -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
......@@ -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
......@@ -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
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment