From e86d18514597b27784bb86a6df3fc5e4ef4ce119 Mon Sep 17 00:00:00 2001 From: Burak Yigit Kaya Date: Wed, 5 Mar 2025 20:25:50 +0000 Subject: [PATCH] ref: Less complicated docker compose detection (#3604) With #3595, we now check both `docker-compose` and `docker compose` versions so this patch removes the implicit fallback to `docker-compose` for `$dc_base` and makes it explicit. --- install/dc-detect-version.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install/dc-detect-version.sh b/install/dc-detect-version.sh index a27dd7b84a..9d52a42ad7 100644 --- a/install/dc-detect-version.sh +++ b/install/dc-detect-version.sh @@ -9,22 +9,20 @@ fi echo "${_group}Initializing Docker Compose ..." # To support users that are symlinking to docker-compose -dc_base="$(docker compose version &>/dev/null && echo 'docker compose' || echo 'docker-compose')" +dc_base="$(docker compose version --short &>/dev/null && echo 'docker compose' || echo '')" dc_base_standalone="$(docker-compose version &>/dev/null && echo 'docker-compose' || echo '')" -COMPOSE_VERSION=$($dc_base version --short || echo '') -STANDALONE_COMPOSE_VERSION=$($dc_base_standalone version --short &>/dev/null || echo '') +COMPOSE_VERSION=$([ -n "$dc_base" ] && $dc_base version --short || echo '') +STANDALONE_COMPOSE_VERSION=$([ -n "$dc_base_standalone" ] && $dc_base_standalone version --short &>/dev/null || echo '') if [[ -z "$COMPOSE_VERSION" && -z "$STANDALONE_COMPOSE_VERSION" ]]; then echo "FAIL: Docker Compose is required to run self-hosted" exit 1 fi -if [[ ! -z "${STANDALONE_COMPOSE_VERSION}" ]]; then - if [[ "$(vergte ${COMPOSE_VERSION//v/} ${STANDALONE_COMPOSE_VERSION//v/})" -eq 1 ]]; then - COMPOSE_VERSION="${STANDALONE_COMPOSE_VERSION}" - dc_base="$dc_base_standalone" - fi +if [[ -z "$COMPOSE_VERSION" || -n "$STANDALONE_COMPOSE_VERSION" && "$(vergte ${COMPOSE_VERSION//v/} ${STANDALONE_COMPOSE_VERSION//v/})" -eq 1 ]]; then + COMPOSE_VERSION="${STANDALONE_COMPOSE_VERSION}" + dc_base="$dc_base_standalone" fi if [[ "$(basename $0)" = "install.sh" ]]; then