From a59827cc6acfc0076aa5473893425192bc522fee Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Thu, 9 Mar 2023 12:07:48 +0100 Subject: [PATCH] chore(run.sh): prefer docker compose plugin over docker-compose --- scripts/ct/run.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/ct/run.sh b/scripts/ct/run.sh index e4882695e..17319dc51 100755 --- a/scripts/ct/run.sh +++ b/scripts/ct/run.sh @@ -21,11 +21,16 @@ help() { echo " otherwise it runs the entire app's CT" } -if command -v docker-compose; then +set +e +if docker compose version; then + DC='docker compose' +elif command -v docker-compose; then DC='docker-compose' else - DC='docker compose' + echo 'Neither "docker compose" or "docker-compose" are available, stop.' + exit 1 fi +set -e WHICH_APP='novalue' CONSOLE='no'