Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix docker-compose version check in tests
[nonrtric.git]
/
test
/
common
/
testcase_common.sh
diff --git
a/test/common/testcase_common.sh
b/test/common/testcase_common.sh
index
a36d031
..
3f5970c
100755
(executable)
--- a/
test/common/testcase_common.sh
+++ b/
test/common/testcase_common.sh
@@
-1199,7
+1199,7
@@
if [ $RUNMODE == "DOCKER" ]; then
echo -e $RED"docker-compose (v.2+) is required to run the test environment, pls install"$ERED
exit 1
else
echo -e $RED"docker-compose (v.2+) is required to run the test environment, pls install"$ERED
exit 1
else
- tmp=$(docker-compose
version
)
+ tmp=$(docker-compose
-v
)
echo " docker-compose installed and using version $tmp"
if [[ "$tmp" == *'v2'* ]]; then
DOCKER_COMPOSE_VERSION="V2"
echo " docker-compose installed and using version $tmp"
if [[ "$tmp" == *'v2'* ]]; then
DOCKER_COMPOSE_VERSION="V2"