From c554abcf62090381f5650b04da5311fbf6a385bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me> Date: Mon, 10 Jul 2023 17:10:34 +0200 Subject: [PATCH] Infra script => Bug fix: check correctly the availability of compose v2 --- infra | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/infra b/infra index 8c8dcfe..aa2ddf9 100755 --- a/infra +++ b/infra @@ -17,9 +17,10 @@ fi ENV_FILE=".env" DOCKER_COMPOSE_COMMAND="docker compose" -# If docker compose is not installed, use docker-compose -if ! [ -x "$(command -v "${DOCKER_COMPOSE_COMMAND}")" ]; then - DOCKER_COMPOSE_COMMAND="docker-compose" +# verify result of docker compose version command +${DOCKER_COMPOSE_COMMAND} version +if [ $? -ne 0 ]; then + DOCKER_COMPOSE_COMMAND="docker-compose" fi ${DOCKER_COMPOSE_COMMAND} stop -- GitLab